summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-16 11:23:24 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-16 11:23:24 -0700
commite10e476fb170a99ecc535a31def69d5e3483a859 (patch)
tree6987fb0785bcbdb69b5a7ad1ec5652df4a49b80c /diff.c
parent2a6f08ac1f6949ed0072aed3240bc04d80051851 (diff)
parent0508fe533dfe1b890f6a2d31ca42ba25466e8ff5 (diff)
downloadgit-e10e476fb170a99ecc535a31def69d5e3483a859.tar.gz
Merge branch 'jk/combine-diff-binary-etc' into maint
* jk/combine-diff-binary-etc: combine-diff: respect textconv attributes refactor get_textconv to not require diff_filespec combine-diff: handle binary files as binary combine-diff: calculate mode_differs earlier combine-diff: split header printing into its own function
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/diff.c b/diff.c
index 61bedaed57..5dd9049c7d 100644
--- a/diff.c
+++ b/diff.c
@@ -1984,19 +1984,7 @@ struct userdiff_driver *get_textconv(struct diff_filespec *one)
return NULL;
diff_filespec_load_driver(one);
- if (!one->driver->textconv)
- return NULL;
-
- if (one->driver->textconv_want_cache && !one->driver->textconv_cache) {
- struct notes_cache *c = xmalloc(sizeof(*c));
- struct strbuf name = STRBUF_INIT;
-
- strbuf_addf(&name, "textconv/%s", one->driver->name);
- notes_cache_init(c, name.buf, one->driver->textconv);
- one->driver->textconv_cache = c;
- }
-
- return one->driver;
+ return userdiff_get_textconv(one->driver);
}
static void builtin_diff(const char *name_a,