2005-12-26 21:31:42 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2005 Johannes Schindelin
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
test_description='Test diff of symlinks.
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
. ./test-lib.sh
|
2008-08-08 09:26:28 +00:00
|
|
|
. "$TEST_DIRECTORY"/diff-lib.sh
|
2005-12-26 21:31:42 +00:00
|
|
|
|
2013-06-07 20:53:34 +00:00
|
|
|
test_expect_success 'diff new symlink and file' '
|
2012-03-01 02:14:14 +00: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 02:14:15 +00: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 02:14:14 +00:00
|
|
|
EOF
|
2013-06-07 20:53:34 +00:00
|
|
|
|
|
|
|
|
# the empty tree
|
2012-03-01 02:14:14 +00:00
|
|
|
git update-index &&
|
|
|
|
|
tree=$(git write-tree) &&
|
2013-06-07 20:53:34 +00:00
|
|
|
|
|
|
|
|
test_ln_s_add xyzzy frotz &&
|
|
|
|
|
echo xyzzy >nitfol &&
|
|
|
|
|
git update-index --add nitfol &&
|
2012-03-01 02:14:14 +00:00
|
|
|
GIT_DIFF_OPTS=--unified=0 git diff-index -M -p $tree >current &&
|
|
|
|
|
compare_diff_patch expected current
|
|
|
|
|
'
|
2005-12-26 21:31:42 +00:00
|
|
|
|
2013-06-07 20:53:34 +00:00
|
|
|
test_expect_success 'diff unchanged symlink and file' '
|
2012-03-01 02:14:14 +00:00
|
|
|
tree=$(git write-tree) &&
|
2012-03-01 02:14:15 +00:00
|
|
|
git update-index frotz nitfol &&
|
2012-03-01 02:14:14 +00:00
|
|
|
test -z "$(git diff-index --name-only $tree)"
|
|
|
|
|
'
|
2005-12-26 21:31:42 +00:00
|
|
|
|
2013-06-07 20:53:34 +00:00
|
|
|
test_expect_success 'diff removed symlink and file' '
|
2012-03-01 02:14:14 +00: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 02:14:15 +00: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 02:14:14 +00:00
|
|
|
EOF
|
|
|
|
|
mv frotz frotz2 &&
|
2012-03-01 02:14:15 +00:00
|
|
|
mv nitfol nitfol2 &&
|
2012-03-01 02:14:14 +00:00
|
|
|
git diff-index -M -p $tree >current &&
|
|
|
|
|
compare_diff_patch expected current
|
|
|
|
|
'
|
2005-12-26 21:31:42 +00:00
|
|
|
|
2013-06-07 20:53:34 +00: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 02:14:16 +00:00
|
|
|
>expected &&
|
2012-03-01 02:14:15 +00:00
|
|
|
rm -f frotz nitfol &&
|
|
|
|
|
echo xyzzy >nitfol &&
|
|
|
|
|
test-chmtime +10 nitfol &&
|
2013-06-07 20:53:34 +00: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 02:14:14 +00:00
|
|
|
git diff-index -M -p $tree >current &&
|
2012-03-01 02:14:15 +00:00
|
|
|
compare_diff_patch expected current &&
|
|
|
|
|
|
|
|
|
|
>expected &&
|
|
|
|
|
git diff-index -M -p -w $tree >current &&
|
2012-03-01 02:14:14 +00:00
|
|
|
compare_diff_patch expected current
|
|
|
|
|
'
|
2005-12-26 21:31:42 +00:00
|
|
|
|
2013-06-07 20:53:34 +00:00
|
|
|
test_expect_success 'diff different symlink and file' '
|
2012-03-01 02:14:14 +00: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 02:14:15 +00:00
|
|
|
diff --git a/nitfol b/nitfol
|
|
|
|
|
index 7c465af..df1db54 100644
|
|
|
|
|
--- a/nitfol
|
|
|
|
|
+++ b/nitfol
|
|
|
|
|
@@ -1 +1 @@
|
|
|
|
|
-xyzzy
|
|
|
|
|
+yxyyz
|
2012-03-01 02:14:14 +00:00
|
|
|
EOF
|
|
|
|
|
rm -f frotz &&
|
2013-06-07 20:53:34 +00: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 02:14:15 +00:00
|
|
|
echo yxyyz >nitfol &&
|
2012-03-01 02:14:14 +00:00
|
|
|
git diff-index -M -p $tree >current &&
|
|
|
|
|
compare_diff_patch expected current
|
|
|
|
|
'
|
2005-12-26 21:31:42 +00:00
|
|
|
|
2012-03-01 02:14:14 +00: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-21 21:01:24 +00: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 02:14:14 +00:00
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
|
diff --git a/file.bin b/file.bin
|
diff-lib.c: adjust position of i-t-a entries in diff
Entries added by "git add -N" are reminder for the user so that they
don't forget to add them before committing. These entries appear in
the index even though they are not real. Their presence in the index
leads to a confusing "git status" like this:
On branch master
Changes to be committed:
new file: foo
Changes not staged for commit:
modified: foo
If you do a "git commit", "foo" will not be included even though
"status" reports it as "to be committed". This patch changes the
output to become
On branch master
Changes not staged for commit:
new file: foo
no changes added to commit
The two hunks in diff-lib.c adjust "diff-index" and "diff-files" so
that i-t-a entries appear as new files in diff-files and nothing in
diff-index.
Due to this change, diff-files may start to report "new files" for the
first time. "add -u" needs to be told about this or it will die in
denial, screaming "new files can't exist! Reality is wrong." Luckily,
it's the only one among run_diff_files() callers that needs fixing.
Now in the new world order, a hierarchy in the index that contain
i-t-a paths is written out as a tree object as if these i-t-a
entries do not exist, and comparing the index with such a tree
object that would result from writing out the hierarchy will result
in no difference. Update a test in t2203 that expected the i-t-a
entries to appear as "added to the index" in the comparison to
instead expect no output.
An earlier change eec3e7e4 (cache-tree: invalidate i-t-a paths after
generating trees, 2012-12-16) becomes an unnecessary pessimization
in the new world order---a cache-tree in the index that corresponds
to a hierarchy with i-t-a paths can now be marked as valid and
record the object name of the tree that results from writing a tree
object out of that hierarchy, as it will compare equal to that tree.
Reverting the commit is left for the future, though, as it is purely
a performance issue and no longer affects correctness.
Helped-by: Michael J Gruber <git@drmicha.warpmail.net>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-16 13:56:46 +00:00
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..d95f3ad
|
|
|
|
|
Binary files /dev/null and b/file.bin differ
|
2012-03-01 02:14:14 +00:00
|
|
|
diff --git a/link.bin b/link.bin
|
diff-lib.c: adjust position of i-t-a entries in diff
Entries added by "git add -N" are reminder for the user so that they
don't forget to add them before committing. These entries appear in
the index even though they are not real. Their presence in the index
leads to a confusing "git status" like this:
On branch master
Changes to be committed:
new file: foo
Changes not staged for commit:
modified: foo
If you do a "git commit", "foo" will not be included even though
"status" reports it as "to be committed". This patch changes the
output to become
On branch master
Changes not staged for commit:
new file: foo
no changes added to commit
The two hunks in diff-lib.c adjust "diff-index" and "diff-files" so
that i-t-a entries appear as new files in diff-files and nothing in
diff-index.
Due to this change, diff-files may start to report "new files" for the
first time. "add -u" needs to be told about this or it will die in
denial, screaming "new files can't exist! Reality is wrong." Luckily,
it's the only one among run_diff_files() callers that needs fixing.
Now in the new world order, a hierarchy in the index that contain
i-t-a paths is written out as a tree object as if these i-t-a
entries do not exist, and comparing the index with such a tree
object that would result from writing out the hierarchy will result
in no difference. Update a test in t2203 that expected the i-t-a
entries to appear as "added to the index" in the comparison to
instead expect no output.
An earlier change eec3e7e4 (cache-tree: invalidate i-t-a paths after
generating trees, 2012-12-16) becomes an unnecessary pessimization
in the new world order---a cache-tree in the index that corresponds
to a hierarchy with i-t-a paths can now be marked as valid and
record the object name of the tree that results from writing a tree
object out of that hierarchy, as it will compare equal to that tree.
Reverting the commit is left for the future, though, as it is purely
a performance issue and no longer affects correctness.
Helped-by: Michael J Gruber <git@drmicha.warpmail.net>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-16 13:56:46 +00:00
|
|
|
new file mode 120000
|
|
|
|
|
index 0000000..dce41ec
|
|
|
|
|
--- /dev/null
|
2012-03-01 02:14:14 +00:00
|
|
|
+++ b/link.bin
|
|
|
|
|
@@ -0,0 +1 @@
|
|
|
|
|
+file.bin
|
|
|
|
|
\ No newline at end of file
|
|
|
|
|
EOF
|
2010-09-21 21:01:24 +00:00
|
|
|
git config diff.bin.binary true &&
|
|
|
|
|
git diff file.bin link.bin >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2005-12-26 21:31:42 +00:00
|
|
|
test_done
|