diff options
| author |  Jeff King <peff@peff.net> | 2017-01-02 17:25:09 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-01-07 18:49:30 -0800 |
| commit | 965cba2e7ee9b272a35d66a11f0a7bf544aa727a (patch) | |
| tree | a04e9feb44586fee85bff420c7d370bf491cfdaf /t/t1021-rerere-in-workdir.sh | |
| parent | preparing for 2.10.3 (diff) | |
| download | tgif-965cba2e7ee9b272a35d66a11f0a7bf544aa727a.tar.xz | |
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>
Diffstat (limited to 't/t1021-rerere-in-workdir.sh')
0 files changed, 0 insertions, 0 deletions