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

Merge branch 'jk/diff-follow-must-take-one-pathspec'

Browse Source 
* jk/diff-follow-must-take-one-pathspec:
  move "--follow needs one pathspec" rule to diff_setup_done
This commit is contained in:
Junio C Hamano
2014-06-16 10:07:09 -07:00
parent b83163643b dd63f169d9
commit b0e2c999af
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
diff.c
View File

@ -3320,6 +3320,9 @@ void diff_setup_done(struct diff_options *options)
}
options->diff_path_counter = 0;
if (DIFF_OPT_TST(options, FOLLOW_RENAMES) && options->pathspec.nr != 1)
die(_("--follow requires exactly one pathspec"));
}
static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)