aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-24 12:46:20 -0800
committerJunio C Hamano <gitster@pobox.com>2010-11-24 12:46:20 -0800
commit78bce6c7e93f4c8797da06cf93f59b7ac8e84ec0 (patch)
tree9a03b1a3d634d5599d1cda642860c7d9da199a89
parent42a038ceae4406bc727440ed2152f8dd753a9f73 (diff)
parentd391c0ff94e1b314b0664db0e8eb5bd92934f9cb (diff)
downloadgit-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
-rw-r--r--diff.c11
-rwxr-xr-xt/t4011-diff-symlink.sh26
2 files changed, 34 insertions, 3 deletions
diff --git a/diff.c b/diff.c
index 340d878f0..095a23863 100644
--- a/diff.c
+++ b/diff.c
@@ -1771,8 +1771,14 @@ static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two, char *pre
static void diff_filespec_load_driver(struct diff_filespec *one)
{
- if (!one->driver)
+ /* Use already-loaded driver */
+ if (one->driver)
+ return;
+
+ if (S_ISREG(one->mode))
one->driver = userdiff_find_by_path(one->path);
+
+ /* Fallback to default settings */
if (!one->driver)
one->driver = userdiff_find_by_name("default");
}
@@ -1820,8 +1826,7 @@ struct userdiff_driver *get_textconv(struct diff_filespec *one)
{
if (!DIFF_FILE_VALID(one))
return NULL;
- if (!S_ISREG(one->mode))
- return NULL;
+
diff_filespec_load_driver(one);
if (!one->driver->textconv)
return NULL;
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