diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-03 14:16:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-03 14:16:04 -0800 |
| commit | c167a96e68b9fb49cab7eb1f2814d7b32f7c0a1a (patch) | |
| tree | 9cd4964f51f8c32133d5e5cce34bedd86e11ee4d /revision.c | |
| parent | 465c30a9c6f68c3bac25cd875624286baa37b41c (diff) | |
| parent | a97262c62f1a31fcc7edf7629d313058bc7d66b5 (diff) | |
| download | git-c167a96e68b9fb49cab7eb1f2814d7b32f7c0a1a.tar.gz | |
Merge branch 'nd/diff-with-path-params'
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 8df4e117ff..f24ead53d5 100644 --- a/revision.c +++ b/revision.c @@ -2044,7 +2044,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; |