kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jc/maint-diff-patch-header' into maint 

"git diff-index" and its friends at the plumbing level showed the
"diff --git" header and nothing else for a path whose cached stat
info is dirty without actual difference when asked to produce a
patch. This was a longstanding bug that we could have fixed long
time ago.

By Junio C Hamano
* jc/maint-diff-patch-header:
  diff -p: squelch "diff --git" header for stat-dirty paths
  t4011: illustrate "diff-index -p" on stat-dirty paths
  t4011: modernise style
maint
Junio C Hamano 2012-03-12 15:46:32 -07:00
parent f629c233e6 b3f01ff29f
commit fce8b5d82f
2 changed files with 111 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diff.c
View File

@ -2210,7 +2210,7 @@ static void builtin_diff(const char *name_a,
struct emit_callback ecbdata; struct emit_callback ecbdata;
const struct userdiff_funcname *pe; const struct userdiff_funcname *pe;


if (!DIFF_XDL_TST(o, WHITESPACE_FLAGS) || must_show_header) { if (must_show_header) {
fprintf(o->file, "%s", header.buf); fprintf(o->file, "%s", header.buf);
strbuf_reset(&header); strbuf_reset(&header);
} }

185
t/t4011-diff-symlink.sh
View File

@ -9,85 +9,110 @@ test_description='Test diff of symlinks.
. ./test-lib.sh . ./test-lib.sh
. "$TEST_DIRECTORY"/diff-lib.sh . "$TEST_DIRECTORY"/diff-lib.sh


cat > expected << EOF test_expect_success SYMLINKS 'diff new symlink and file' '
diff --git a/frotz b/frotz cat >expected <<-\EOF &&
new file mode 120000 diff --git a/frotz b/frotz
index 0000000..7c465af new file mode 120000
--- /dev/null index 0000000..7c465af
+++ b/frotz --- /dev/null
@@ -0,0 +1 @@ +++ b/frotz
+xyzzy @@ -0,0 +1 @@
\ No newline at end of file +xyzzy
EOF \ No newline at end of file

diff --git a/nitfol b/nitfol
test_expect_success SYMLINKS \ new file mode 100644
'diff new symlink' \ index 0000000..7c465af
'ln -s xyzzy frotz && --- /dev/null
+++ b/nitfol
@@ -0,0 +1 @@
+xyzzy
EOF
ln -s xyzzy frotz &&
echo xyzzy >nitfol &&
git update-index && git update-index &&
tree=$(git write-tree) && tree=$(git write-tree) &&
git update-index --add frotz && git update-index --add frotz nitfol &&
GIT_DIFF_OPTS=--unified=0 git diff-index -M -p $tree > current && GIT_DIFF_OPTS=--unified=0 git diff-index -M -p $tree >current &&
compare_diff_patch current expected' compare_diff_patch expected current
'


test_expect_success SYMLINKS \ test_expect_success SYMLINKS 'diff unchanged symlink and file' '
'diff unchanged symlink' \ tree=$(git write-tree) &&
'tree=$(git write-tree) && git update-index frotz nitfol &&
git update-index frotz && test -z "$(git diff-index --name-only $tree)"
test -z "$(git diff-index --name-only $tree)"' '


cat > expected << EOF test_expect_success SYMLINKS 'diff removed symlink and file' '
diff --git a/frotz b/frotz cat >expected <<-\EOF &&
deleted file mode 120000 diff --git a/frotz b/frotz
index 7c465af..0000000 deleted file mode 120000
--- a/frotz index 7c465af..0000000
+++ /dev/null --- a/frotz
@@ -1 +0,0 @@ +++ /dev/null
-xyzzy @@ -1 +0,0 @@
\ No newline at end of file -xyzzy
EOF \ 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 \ test_expect_success SYMLINKS 'diff identical, but newly created symlink and file' '
'diff removed symlink' \ >expected &&
'mv frotz frotz2 && rm -f frotz nitfol &&
git diff-index -M -p $tree > current && echo xyzzy >nitfol &&
compare_diff_patch current expected' test-chmtime +10 nitfol &&
ln -s xyzzy frotz &&
git diff-index -M -p $tree >current &&
compare_diff_patch expected current &&


cat > expected << EOF >expected &&
diff --git a/frotz b/frotz git diff-index -M -p -w $tree >current &&
EOF compare_diff_patch expected current
'


test_expect_success SYMLINKS \ test_expect_success SYMLINKS 'diff different symlink and file' '
'diff identical, but newly created symlink' \ cat >expected <<-\EOF &&
'ln -s xyzzy frotz && diff --git a/frotz b/frotz
git diff-index -M -p $tree > current && index 7c465af..df1db54 120000
compare_diff_patch current expected' --- a/frotz

+++ b/frotz
cat > expected << EOF @@ -1 +1 @@
diff --git a/frotz b/frotz -xyzzy
index 7c465af..df1db54 120000 \ No newline at end of file
--- a/frotz +yxyyz
+++ b/frotz \ No newline at end of file
@@ -1 +1 @@ diff --git a/nitfol b/nitfol
-xyzzy index 7c465af..df1db54 100644
\ No newline at end of file --- a/nitfol
+yxyyz +++ b/nitfol
\ No newline at end of file @@ -1 +1 @@
EOF -xyzzy

+yxyyz
test_expect_success SYMLINKS \ EOF
'diff different symlink' \ rm -f frotz &&
'rm frotz &&
ln -s yxyyz frotz && ln -s yxyyz frotz &&
git diff-index -M -p $tree > current && echo yxyyz >nitfol &&
compare_diff_patch current expected' git diff-index -M -p $tree >current &&
compare_diff_patch expected current
'


test_expect_success SYMLINKS \ test_expect_success SYMLINKS 'diff symlinks with non-existing targets' '
'diff symlinks with non-existing targets' \ ln -s narf pinky &&
'ln -s narf pinky &&
ln -s take\ over brain && ln -s take\ over brain &&
test_must_fail git diff --no-index pinky brain > output 2> output.err && test_must_fail git diff --no-index pinky brain >output 2>output.err &&
grep narf output && grep narf output &&
! grep error output.err' ! test -s output.err
'


test_expect_success SYMLINKS 'setup symlinks with attributes' ' test_expect_success SYMLINKS 'setup symlinks with attributes' '
echo "*.bin diff=bin" >>.gitattributes && echo "*.bin diff=bin" >>.gitattributes &&
@ -96,19 +121,19 @@ test_expect_success SYMLINKS 'setup symlinks with attributes' '
git add -N file.bin link.bin git add -N file.bin link.bin
' '


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
test_expect_success SYMLINKS 'symlinks do not respect userdiff config by path' ' 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 config diff.bin.binary true &&
git diff file.bin link.bin >actual && git diff file.bin link.bin >actual &&
test_cmp expect actual test_cmp expect actual