diff options
author | Jeff King <peff@peff.net> | 2019-02-16 01:57:56 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-02-24 07:08:34 -0800 |
commit | 287ab28bfae14431f3f57abeb92149c460044850 (patch) | |
tree | 0141e02aa7e1208c68484d960e96121b5ddcc946 /diff.h | |
parent | Git 2.20.1 (diff) | |
download | tgif-287ab28bfae14431f3f57abeb92149c460044850.tar.xz |
diff: reuse diff setup for --no-index case
When "--no-index" is in effect (or implied by the arguments), git-diff
jumps early to a special code path to perform that diff. This means we
miss out on some settings like enabling --ext-diff and --textconv by
default.
Let's jump to the no-index path _after_ we've done more setup on
rev.diffopt. Since some of the options don't affect us (e.g., items
related to the index), let's re-order the setup into two blocks (see the
in-code comments).
Note that we also need to stop re-initializing the diffopt struct in
diff_no_index(). This should not be necessary, as it will already have
been initialized by cmd_diff() (and there are no other callers). That in
turn lets us drop the "repository" argument from diff_no_index (which
never made much sense, since the whole point is that you don't need a
repository).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r-- | diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -434,7 +434,7 @@ int diff_flush_patch_id(struct diff_options *, struct object_id *, int); int diff_result_code(struct diff_options *, int); -void diff_no_index(struct repository *, struct rev_info *, int, const char **); +void diff_no_index(struct rev_info *, int, const char **); int index_differs_from(const char *def, const struct diff_flags *flags, int ita_invisible_in_index); |