diff options
| author | Jeff King <peff@peff.net> | 2019-02-16 06:57:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-24 15:08:34 (GMT) |
| commit | 287ab28bfae14431f3f57abeb92149c460044850 (patch) | |
| tree | 0141e02aa7e1208c68484d960e96121b5ddcc946 /diff-no-index.c | |
| parent | 0d0ac3826a3bbb9247e39e12623bbcfdd722f24c (diff) | |
| download | git-287ab28bfae14431f3f57abeb92149c460044850.zip git-287ab28bfae14431f3f57abeb92149c460044850.tar.gz git-287ab28bfae14431f3f57abeb92149c460044850.tar.bz2 | |
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-no-index.c')
| -rw-r--r-- | diff-no-index.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index 9414e92..6001bae 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -233,8 +233,7 @@ static void fixup_paths(const char **path, struct strbuf *replacement) } } -void diff_no_index(struct repository *r, - struct rev_info *revs, +void diff_no_index(struct rev_info *revs, int argc, const char **argv) { int i; @@ -242,11 +241,6 @@ void diff_no_index(struct repository *r, struct strbuf replacement = STRBUF_INIT; const char *prefix = revs->prefix; - /* - * FIXME: --no-index should not look at index and we should be - * able to pass NULL repo. Maybe later. - */ - repo_diff_setup(r, &revs->diffopt); for (i = 1; i < argc - 2; ) { int j; if (!strcmp(argv[i], "--no-index")) |