[PATCH 3/3] t3600: test rm of path with changed leading symlinks
From: Jeff King <hidden>
Date: 2016-06-15 22:56:41
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 3/3] t3600: test rm of path with changed leading symlinks · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 3/3] t3600: test rm of path with changed leading symlinks · Jeff King <hidden>
- 2016-06-15 · Re: [PATCH 3/3] t3600: test rm of path with changed leading symlinks · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 3/3] t3600: test rm of path with changed leading symlinks · Jeff King <hidden>
- 2016-06-15 · Re: [PATCH 3/3] t3600: test rm of path with changed leading symlinks · Junio C Hamano <hidden>
If we have a path "d/f" but replace "d" with a symlink to a new directory "e", how should we handle "git rm d/f"? It may seem at first like we need new protections to make sure that we do not delete random content from "e/f". However, we are already covered by git-rm's existing protections: it is happy if the working tree file is either already deleted, or if its content matches that of the index and HEAD (and otherwise requires "-f"). Let's add some tests to make sure that these protections remain in place when used across symlinks. We also want to make sure that neither the symlink nor the pointed-to directory is accidentally removed in an attempt to clean up empty elements of the leading path. Signed-off-by: Jeff King <redacted> --- t/t3600-rm.sh | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index a2e1a03..9eaec08 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh@@ -659,4 +659,47 @@ test_expect_success 'rm of file when it has become a directory' ' test_path_is_file d/f ' +test_expect_success 'set up commit with d/f' ' + rm -rf d e && + mkdir d && + echo content >d/f && + git add d && + git commit -m d +' + +test_expect_success SYMLINKS 'replace dir with symlink to dir (file missing)' ' + git reset --hard && + rm -rf d e && + mkdir e && + ln -s e d && + git rm d/f && + test_must_fail git rev-parse --verify :d/f && + test -h d && + test_path_is_dir e +' + +test_expect_success SYMLINKS 'replace dir with symlink to dir (same content)' ' + git reset --hard && + rm -rf d e && + mkdir e && + echo content >e/f && + ln -s e d && + git rm d/f && + test_must_fail git rev-parse --verify :d/f && + test -h d && + test_path_is_dir e +' + +test_expect_success SYMLINKS 'replace dir with symlink to dir (new content)' ' + git reset --hard && + rm -rf d e && + mkdir e && + echo changed >e/f && + ln -s e d && + test_must_fail git rm d/f && + git rev-parse --verify :d/f && + test -h d && + test_path_is_file e/f +' + test_done
--
1.8.2.rc0.33.gd915649