diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-07 09:59:59 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 09:59:59 +0900 |
| commit | 12e5bdd9c4bfa0131b00b20be2cc48a8e2b08a2d (patch) | |
| tree | fba33edaee8716bf482f11de261f6af23568636a /diff-no-index.c | |
| parent | 68731c7ec780f1ad1c08d9c9c7d297cdc553a118 (diff) | |
| parent | 287ab28bfae14431f3f57abeb92149c460044850 (diff) | |
Merge branch 'jk/diff-no-index-initialize'
"git diff --no-index" may still want to access Git goodies like
--ext-diff and --textconv, but so far these have been ignored,
which has been corrected.
* jk/diff-no-index-initialize:
diff: reuse diff setup for --no-index case
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 9414e922d1..6001baecd4 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")) |