2005-12-27 00:31:42 +03:00
|
|
|
#!/bin/sh
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2005 Johannes Schindelin
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
test_description='Test diff of symlinks.
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
. ./test-lib.sh
|
2008-08-08 13:26:28 +04:00
|
|
|
. "$TEST_DIRECTORY"/diff-lib.sh
|
2005-12-27 00:31:42 +03:00
|
|
|
|
2013-06-08 00:53:34 +04:00
|
|
|
test_expect_success 'diff new symlink and file' '
|
2012-03-01 06:14:14 +04:00
|
|
|
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
|
2012-03-01 06:14:15 +04:00
|
|
|
diff --git a/nitfol b/nitfol
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..7c465af
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/nitfol
|
|
|
|
|
@@ -0,0 +1 @@
|
|
|
|
|
+xyzzy
|
2012-03-01 06:14:14 +04:00
|
|
|
EOF
|
2013-06-08 00:53:34 +04:00
|
|
|
|
|
|
|
|
# the empty tree
|
2012-03-01 06:14:14 +04:00
|
|
|
git update-index &&
|
|
|
|
|
tree=$(git write-tree) &&
|
2013-06-08 00:53:34 +04:00
|
|
|
|
|
|
|
|
test_ln_s_add xyzzy frotz &&
|
|
|
|
|
echo xyzzy >nitfol &&
|
|
|
|
|
git update-index --add nitfol &&
|
2012-03-01 06:14:14 +04:00
|
|
|
GIT_DIFF_OPTS=--unified=0 git diff-index -M -p $tree >current &&
|
|
|
|
|
compare_diff_patch expected current
|
|
|
|
|
'
|
2005-12-27 00:31:42 +03:00
|
|
|
|
2013-06-08 00:53:34 +04:00
|
|
|
test_expect_success 'diff unchanged symlink and file' '
|
2012-03-01 06:14:14 +04:00
|
|
|
tree=$(git write-tree) &&
|
2012-03-01 06:14:15 +04:00
|
|
|
git update-index frotz nitfol &&
|
2012-03-01 06:14:14 +04:00
|
|
|
test -z "$(git diff-index --name-only $tree)"
|
|
|
|
|
'
|
2005-12-27 00:31:42 +03:00
|
|
|
|
2013-06-08 00:53:34 +04:00
|
|
|
test_expect_success 'diff removed symlink and file' '
|
2012-03-01 06:14:14 +04:00
|
|
|
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
|
2012-03-01 06:14:15 +04:00
|
|
|
diff --git a/nitfol b/nitfol
|
|
|
|
|
deleted file mode 100644
|
|
|
|
|
index 7c465af..0000000
|
|
|
|
|
--- a/nitfol
|
|
|
|
|
+++ /dev/null
|
|
|
|
|
@@ -1 +0,0 @@
|
|
|
|
|
-xyzzy
|
2012-03-01 06:14:14 +04:00
|
|
|
EOF
|
|
|
|
|
mv frotz frotz2 &&
|
2012-03-01 06:14:15 +04:00
|
|
|
mv nitfol nitfol2 &&
|
2012-03-01 06:14:14 +04:00
|
|
|
git diff-index -M -p $tree >current &&
|
|
|
|
|
compare_diff_patch expected current
|
|
|
|
|
'
|
2005-12-27 00:31:42 +03:00
|
|
|
|
2013-06-08 00:53:34 +04:00
|
|
|
test_expect_success 'diff identical, but newly created symlink and file' '
|
diff -p: squelch "diff --git" header for stat-dirty paths
The plumbing "diff" commands look at the working tree files without
refreshing the index themselves for performance reasons (the calling
script is expected to do that upfront just once, before calling one or
more of them). In the early days of git, they showed the "diff --git"
header before they actually ask the xdiff machinery to produce patches,
and ended up showing only these headers if the real contents are the same
and the difference they noticed was only because the stat info cached in
the index did not match that of the working tree. It was too late for the
implementation to take the header that it already emitted back.
But 3e97c7c (No diff -b/-w output for all-whitespace changes, 2009-11-19)
introduced necessary logic to keep the meta-information headers in a
strbuf and delay their output until the xdiff machinery noticed actual
changes. This was primarily in order to generate patches that ignore
whitespaces. When operating under "-w" mode, we wouldn't know if the
header is needed until we actually look at the resulting patch, so it was
a sensible thing to do, but we did not realize that the same reasoning
applies to stat-dirty paths.
Later, 296c6bb (diff: fix "git show -C -C" output when renaming a binary
file, 2010-05-26) generalized this machinery and added must_show_header
toggle. This is turned on when the header must be shown even when there
is no patch to be produced, e.g. only the mode was changed, or the path
was renamed, without changing the contents. However, when it did so, it
still kept the special case for the "-w" mode, which meant that the
plumbing would keep showing these phantom changes.
This corrects this historical inconsistency by allowing the plumbing to
omit paths that are only stat-dirty from its output in the same way as it
handles whitespace only changes under "-w" option.
The change in the behaviour can be seen in the updated test.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-01 06:14:16 +04:00
|
|
|
>expected &&
|
2012-03-01 06:14:15 +04:00
|
|
|
rm -f frotz nitfol &&
|
|
|
|
|
echo xyzzy >nitfol &&
|
|
|
|
|
test-chmtime +10 nitfol &&
|
2013-06-08 00:53:34 +04:00
|
|
|
if test_have_prereq SYMLINKS
|
|
|
|
|
then
|
|
|
|
|
ln -s xyzzy frotz
|
|
|
|
|
else
|
|
|
|
|
printf xyzzy >frotz
|
|
|
|
|
# the symlink property propagates from the index
|
|
|
|
|
fi &&
|
2012-03-01 06:14:14 +04:00
|
|
|
git diff-index -M -p $tree >current &&
|
2012-03-01 06:14:15 +04:00
|
|
|
compare_diff_patch expected current &&
|
|
|
|
|
|
|
|
|
|
>expected &&
|
|
|
|
|
git diff-index -M -p -w $tree >current &&
|
2012-03-01 06:14:14 +04:00
|
|
|
compare_diff_patch expected current
|
|
|
|
|
'
|
2005-12-27 00:31:42 +03:00
|
|
|
|
2013-06-08 00:53:34 +04:00
|
|
|
test_expect_success 'diff different symlink and file' '
|
2012-03-01 06:14:14 +04:00
|
|
|
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
|
2012-03-01 06:14:15 +04:00
|
|
|
diff --git a/nitfol b/nitfol
|
|
|
|
|
index 7c465af..df1db54 100644
|
|
|
|
|
--- a/nitfol
|
|
|
|
|
+++ b/nitfol
|
|
|
|
|
@@ -1 +1 @@
|
|
|
|
|
-xyzzy
|
|
|
|
|
+yxyyz
|
2012-03-01 06:14:14 +04:00
|
|
|
EOF
|
|
|
|
|
rm -f frotz &&
|
2013-06-08 00:53:34 +04:00
|
|
|
if test_have_prereq SYMLINKS
|
|
|
|
|
then
|
|
|
|
|
ln -s yxyyz frotz
|
|
|
|
|
else
|
|
|
|
|
printf yxyyz >frotz
|
|
|
|
|
# the symlink property propagates from the index
|
|
|
|
|
fi &&
|
2012-03-01 06:14:15 +04:00
|
|
|
echo yxyyz >nitfol &&
|
2012-03-01 06:14:14 +04:00
|
|
|
git diff-index -M -p $tree >current &&
|
|
|
|
|
compare_diff_patch expected current
|
|
|
|
|
'
|
2005-12-27 00:31:42 +03:00
|
|
|
|
2012-03-01 06:14:14 +04:00
|
|
|
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
|
|
|
|
|
'
|
2010-09-22 01:01:24 +04:00
|
|
|
|
|
|
|
|
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' '
|
2012-03-01 06:14:14 +04:00
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
|
diff --git a/file.bin b/file.bin
|
Revert "diff-lib.c: adjust position of i-t-a entries in diff"
This reverts commit d95d728aba06a34394d15466045cbdabdada58a2.
It turns out that many other commands that need to interact with the
result of running diff-files and diff-index, e.g. "git apply", "git
rm", etc., need to be adjusted to the new world order it brings in.
For example, it would break this sequence to correct a whitespace
breakage in the parts you changed:
git add -N file
git diff --cached file | git apply --cached --whitespace=fix
git checkout file
In the old world order, "diff" showed a patch to modify an existing
empty file by adding its full contents, and "apply" updated the
index by modifying the existing empty blob (which is what an
Intent-to-Add entry records in the index) with that patch.
In the new world order, "diff" shows a patch to create a new file
with its full contents, but because "apply" thinks that the i-t-a
entry already exists in the index, it refused to accept a creation.
Adjusting "apply" to this new world order is easy, but we need to
assess the extent of the damage to the rest of the system the new
world order brought in before going forward and adjust them all,
after which we can resurrect the commit being reverted here.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-06-23 20:27:47 +03:00
|
|
|
index e69de29..d95f3ad 100644
|
|
|
|
|
Binary files a/file.bin and b/file.bin differ
|
2012-03-01 06:14:14 +04:00
|
|
|
diff --git a/link.bin b/link.bin
|
Revert "diff-lib.c: adjust position of i-t-a entries in diff"
This reverts commit d95d728aba06a34394d15466045cbdabdada58a2.
It turns out that many other commands that need to interact with the
result of running diff-files and diff-index, e.g. "git apply", "git
rm", etc., need to be adjusted to the new world order it brings in.
For example, it would break this sequence to correct a whitespace
breakage in the parts you changed:
git add -N file
git diff --cached file | git apply --cached --whitespace=fix
git checkout file
In the old world order, "diff" showed a patch to modify an existing
empty file by adding its full contents, and "apply" updated the
index by modifying the existing empty blob (which is what an
Intent-to-Add entry records in the index) with that patch.
In the new world order, "diff" shows a patch to create a new file
with its full contents, but because "apply" thinks that the i-t-a
entry already exists in the index, it refused to accept a creation.
Adjusting "apply" to this new world order is easy, but we need to
assess the extent of the damage to the rest of the system the new
world order brought in before going forward and adjust them all,
after which we can resurrect the commit being reverted here.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-06-23 20:27:47 +03:00
|
|
|
index e69de29..dce41ec 120000
|
|
|
|
|
--- a/link.bin
|
2012-03-01 06:14:14 +04:00
|
|
|
+++ b/link.bin
|
|
|
|
|
@@ -0,0 +1 @@
|
|
|
|
|
+file.bin
|
|
|
|
|
\ No newline at end of file
|
|
|
|
|
EOF
|
2010-09-22 01:01:24 +04:00
|
|
|
git config diff.bin.binary true &&
|
|
|
|
|
git diff file.bin link.bin >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2005-12-27 00:31:42 +03:00
|
|
|
test_done
|
