mirror of
https://github.com/git/git.git
synced 2024-11-09 02:33:11 +01:00
70836a6f8b
The part of the test that is about symbolic links in the index does not require that the corresponding file system entry is actually a symbolic link. Use test_ln_s_add to insert a symbolic link in the index. When the file system does not support symbolic links, we actually have a regular file in the worktree, which we can update as if it were a symbolic link. diff-index picks up the symbolic link property from the index. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
157 lines
3.4 KiB
Bash
Executable file
157 lines
3.4 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 '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
|
|
|
|
# the empty tree
|
|
git update-index &&
|
|
tree=$(git write-tree) &&
|
|
|
|
test_ln_s_add xyzzy frotz &&
|
|
echo xyzzy >nitfol &&
|
|
git update-index --add nitfol &&
|
|
GIT_DIFF_OPTS=--unified=0 git diff-index -M -p $tree >current &&
|
|
compare_diff_patch expected current
|
|
'
|
|
|
|
test_expect_success '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 '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 'diff identical, but newly created symlink and file' '
|
|
>expected &&
|
|
rm -f frotz nitfol &&
|
|
echo xyzzy >nitfol &&
|
|
test-chmtime +10 nitfol &&
|
|
if test_have_prereq SYMLINKS
|
|
then
|
|
ln -s xyzzy frotz
|
|
else
|
|
printf xyzzy >frotz
|
|
# the symlink property propagates from the index
|
|
fi &&
|
|
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 '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 &&
|
|
if test_have_prereq SYMLINKS
|
|
then
|
|
ln -s yxyyz frotz
|
|
else
|
|
printf yxyyz >frotz
|
|
# the symlink property propagates from the index
|
|
fi &&
|
|
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
|