diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:15 -0800 |
| commit | 02dab5d399fb276f91646d7780da90596bffefab (patch) | |
| tree | 29b03cb0e3c0a2111307903c4cf1ba9d895c25d3 /revision.c | |
| parent | Merge branch 'dw/subtree-split-do-not-drop-merge' into maint (diff) | |
| parent | diff: make -O and --output work in subdirectory (diff) | |
| download | tgif-02dab5d399fb276f91646d7780da90596bffefab.tar.xz | |
Merge branch 'nd/diff-with-path-params' into maint
A few options of "git diff" did not work well when the command was
run from a subdirectory.
* nd/diff-with-path-params:
diff: make -O and --output work in subdirectory
diff-no-index: do not take a redundant prefix argument
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.c b/revision.c index 0a282f533b..14daefb174 100644 --- a/revision.c +++ b/revision.c @@ -2049,7 +2049,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg } else if (!strcmp(arg, "--ignore-missing")) { revs->ignore_missing = 1; } else { - int opts = diff_opt_parse(&revs->diffopt, argv, argc); + int opts = diff_opt_parse(&revs->diffopt, argv, argc, revs->prefix); if (!opts) unkv[(*unkc)++] = arg; return opts; |