| commit | 965cba2e7ee9b272a35d66a11f0a7bf544aa727a | |
| author | Jeff King <peff@peff.net> | |
| Mon, 2 Jan 2017 22:25:09 +0000 (2 17:25 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 8 Jan 2017 02:49:30 +0000 (7 18:49 -0800) | ||
| tree | a04e9feb44586fee85bff420c7d370bf491cfdaf | treesnapshot (tar.gz zip) |
| parent | c3808ca6982b0ad7ee9b87eca9b50b9a24ec08b0 | commitdiff |
archive-zip: load userdiff config
Since 4aff646d17 (archive-zip: mark text files in archives,
2015-03-05), the zip archiver will look at the userdiff
driver to decide whether a file is text or binary. This
usually doesn't need to look any further than the attributes
themselves (e.g., "-diff", etc). But if the user defines a
custom driver like "diff=foo", we need to look at
"diff.foo.binary" in the config. Prior to this patch, we
didn't actually load it.
Signed-off-by: Jeff King <peff@peff.net>
Acked-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Since 4aff646d17 (archive-zip: mark text files in archives,
2015-03-05), the zip archiver will look at the userdiff
driver to decide whether a file is text or binary. This
usually doesn't need to look any further than the attributes
themselves (e.g., "-diff", etc). But if the user defines a
custom driver like "diff=foo", we need to look at
"diff.foo.binary" in the config. Prior to this patch, we
didn't actually load it.
Signed-off-by: Jeff King <peff@peff.net>
Acked-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| archive-zip.c | diffblobblamehistory | |
| t/t5003-archive-zip.sh | diffblobblamehistory |