diff options
Diffstat (limited to 'third_party/git/t/t4011-diff-symlink.sh')
| -rwxr-xr-x | third_party/git/t/t4011-diff-symlink.sh | 159 |
1 files changed, 0 insertions, 159 deletions
diff --git a/third_party/git/t/t4011-diff-symlink.sh b/third_party/git/t/t4011-diff-symlink.sh deleted file mode 100755 index 5ae19b987d..0000000000 --- a/third_party/git/t/t4011-diff-symlink.sh +++ /dev/null @@ -1,159 +0,0 @@ -#!/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-tool 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_must_be_empty 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 - new file mode 100644 - index 0000000..d95f3ad - Binary files /dev/null and b/file.bin differ - diff --git a/link.bin b/link.bin - new file mode 120000 - index 0000000..dce41ec - --- /dev/null - +++ 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 |