aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-21 22:11:27 -0700
committerJunio C Hamano <gitster@pobox.com>2015-03-26 14:08:43 -0700
commit06151739988601b0fe6179c6c67a0031b85b536f (patch)
treed67e510b5ad547936014e1659445f50d7fe54785 /t
parentc9e1f2c7f2acca17c629255b96761a4a1047a28a (diff)
downloadgit-06151739988601b0fe6179c6c67a0031b85b536f.tar.gz
git-06151739988601b0fe6179c6c67a0031b85b536f.tar.xz
diff-no-index: align D/F handling with that of normal Git
When a commit changes a path P that used to be a file to a directory and creates a new path P/X in it, "git show" would say that file P was removed and file P/X was created for such a commit. However, if we compare two directories, D1 and D2, where D1 has a file D1/P in it and D2 has a directory D2/P under which there is a file D2/P/X, and ask "git diff --no-index D1 D2" to show their differences, we simply get a refusal "file/directory conflict". Surely, that may be what GNU diff does, but we can do better and it is easy to do so. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t4053-diff-no-index.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t4053-diff-no-index.sh b/t/t4053-diff-no-index.sh
index 01eca4c27..596dfe712 100755
--- a/t/t4053-diff-no-index.sh
+++ b/t/t4053-diff-no-index.sh
@@ -77,4 +77,16 @@ test_expect_success 'diff D F and diff F D' '
)
'
+test_expect_success 'turning a file into a directory' '
+ (
+ cd non/git &&
+ mkdir d e e/sub &&
+ echo 1 >d/sub &&
+ echo 2 >e/sub/file &&
+ printf "D\td/sub\nA\te/sub/file\n" >expect &&
+ test_must_fail git diff --no-index --name-status d e >actual &&
+ test_cmp expect actual
+ )
+'
+
test_done