diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-24 12:46:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-24 12:46:20 -0800 |
| commit | 78bce6c7e93f4c8797da06cf93f59b7ac8e84ec0 (patch) | |
| tree | 9a03b1a3d634d5599d1cda642860c7d9da199a89 /t | |
| parent | 42a038ceae4406bc727440ed2152f8dd753a9f73 (diff) | |
| parent | d391c0ff94e1b314b0664db0e8eb5bd92934f9cb (diff) | |
| download | git-78bce6c7e93f4c8797da06cf93f59b7ac8e84ec0.tar.gz git-78bce6c7e93f4c8797da06cf93f59b7ac8e84ec0.tar.xz | |
Merge branch 'jk/no-textconv-symlink' into maint
* jk/no-textconv-symlink:
diff: don't use pathname-based diff drivers for symlinks
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4011-diff-symlink.sh | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh index 6f6948925..408a19c4c 100755 --- a/t/t4011-diff-symlink.sh +++ b/t/t4011-diff-symlink.sh @@ -88,4 +88,30 @@ test_expect_success SYMLINKS \ test_must_fail git diff --no-index pinky brain > output 2> output.err && grep narf output && ! grep error 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 +' + +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' ' + git config diff.bin.binary true && + git diff file.bin link.bin >actual && + test_cmp expect actual +' + test_done |