mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/diff-with-path-params'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2016-02-03 14:16:04 -08:00
parent 465c30a9c6 a97262c62f
commit c167a96e68
7 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
revision.c
View File

@ -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;