summaryrefslogtreecommitdiff
path: root/diff.c
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 /diff.c
parent42a038ceae4406bc727440ed2152f8dd753a9f73 (diff)
parentd391c0ff94e1b314b0664db0e8eb5bd92934f9cb (diff)
downloadgit-78bce6c7e93f4c8797da06cf93f59b7ac8e84ec0.tar.gz
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 'diff.c')
-rw-r--r--diff.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/diff.c b/diff.c
index 340d878f02..095a238636 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;