mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
5597e84b51
The plumbing that looks at the working tree, i.e. "diff-index" and "diff-files", always emit the "diff --git a/path b/path" header lines without anything else for paths that are only stat-dirty (i.e. different only because the cached stat information in the index no longer matches that of the working tree, but the real contents are the same), when these commands are run with "-p" option to produce patches. Illustrate this current behaviour. Also demonstrate that with the "-w" option, we (correctly) hold off showing a "diff --git" header until actual differences have been found. This also suppresses the header for merely stat-dirty files, which is inconsistent. Signed-off-by: Junio C Hamano <gitster@pobox.com>
146 lines
3.3 KiB
Bash
Executable file
146 lines
3.3 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Johannes Schindelin
|
|
#
|
|
|
|
test_description='Test diff of symlinks.
|
|
|
|
'
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/diff-lib.sh
|
|
|
|
test_expect_success SYMLINKS 'diff new symlink and file' '
|
|
cat >expected <<-\EOF &&
|
|
diff --git a/frotz b/frotz
|
|
new file mode 120000
|
|
index 0000000..7c465af
|
|
--- /dev/null
|
|
+++ b/frotz
|
|
@@ -0,0 +1 @@
|
|
+xyzzy
|
|
\ No newline at end of file
|
|
diff --git a/nitfol b/nitfol
|
|
new file mode 100644
|
|
index 0000000..7c465af
|
|
--- /dev/null
|
|
+++ b/nitfol
|
|
@@ -0,0 +1 @@
|
|
+xyzzy
|
|
EOF
|
|
ln -s xyzzy frotz &&
|
|
echo xyzzy >nitfol &&
|
|
git update-index &&
|
|
tree=$(git write-tree) &&
|
|
git update-index --add frotz nitfol &&
|
|
GIT_DIFF_OPTS=--unified=0 git diff-index -M -p $tree >current &&
|
|
compare_diff_patch expected current
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'diff unchanged symlink and file' '
|
|
tree=$(git write-tree) &&
|
|
git update-index frotz nitfol &&
|
|
test -z "$(git diff-index --name-only $tree)"
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'diff removed symlink and file' '
|
|
cat >expected <<-\EOF &&
|
|
diff --git a/frotz b/frotz
|
|
deleted file mode 120000
|
|
index 7c465af..0000000
|
|
--- a/frotz
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-xyzzy
|
|
\ No newline at end of file
|
|
diff --git a/nitfol b/nitfol
|
|
deleted file mode 100644
|
|
index 7c465af..0000000
|
|
--- a/nitfol
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-xyzzy
|
|
EOF
|
|
mv frotz frotz2 &&
|
|
mv nitfol nitfol2 &&
|
|
git diff-index -M -p $tree >current &&
|
|
compare_diff_patch expected current
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'diff identical, but newly created symlink and file' '
|
|
cat >expected <<-\EOF &&
|
|
diff --git a/frotz b/frotz
|
|
diff --git a/nitfol b/nitfol
|
|
EOF
|
|
rm -f frotz nitfol &&
|
|
echo xyzzy >nitfol &&
|
|
test-chmtime +10 nitfol &&
|
|
ln -s xyzzy frotz &&
|
|
git diff-index -M -p $tree >current &&
|
|
compare_diff_patch expected current &&
|
|
|
|
>expected &&
|
|
git diff-index -M -p -w $tree >current &&
|
|
compare_diff_patch expected current
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'diff different symlink and file' '
|
|
cat >expected <<-\EOF &&
|
|
diff --git a/frotz b/frotz
|
|
index 7c465af..df1db54 120000
|
|
--- a/frotz
|
|
+++ b/frotz
|
|
@@ -1 +1 @@
|
|
-xyzzy
|
|
\ No newline at end of file
|
|
+yxyyz
|
|
\ No newline at end of file
|
|
diff --git a/nitfol b/nitfol
|
|
index 7c465af..df1db54 100644
|
|
--- a/nitfol
|
|
+++ b/nitfol
|
|
@@ -1 +1 @@
|
|
-xyzzy
|
|
+yxyyz
|
|
EOF
|
|
rm -f frotz &&
|
|
ln -s yxyyz frotz &&
|
|
echo yxyyz >nitfol &&
|
|
git diff-index -M -p $tree >current &&
|
|
compare_diff_patch expected current
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'diff symlinks with non-existing targets' '
|
|
ln -s narf pinky &&
|
|
ln -s take\ over brain &&
|
|
test_must_fail git diff --no-index pinky brain >output 2>output.err &&
|
|
grep narf output &&
|
|
! test -s output.err
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'setup symlinks with attributes' '
|
|
echo "*.bin diff=bin" >>.gitattributes &&
|
|
echo content >file.bin &&
|
|
ln -s file.bin link.bin &&
|
|
git add -N file.bin link.bin
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'symlinks do not respect userdiff config by path' '
|
|
cat >expect <<-\EOF &&
|
|
diff --git a/file.bin b/file.bin
|
|
index e69de29..d95f3ad 100644
|
|
Binary files a/file.bin and b/file.bin differ
|
|
diff --git a/link.bin b/link.bin
|
|
index e69de29..dce41ec 120000
|
|
--- a/link.bin
|
|
+++ b/link.bin
|
|
@@ -0,0 +1 @@
|
|
+file.bin
|
|
\ No newline at end of file
|
|
EOF
|
|
git config diff.bin.binary true &&
|
|
git diff file.bin link.bin >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|