mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-09 07:06:12 +02:00
Code

Merge branch 'jk/diff-CBM' 

* jk/diff-CBM:
  diff: report bogus input to -C/-M/-B
This commit is contained in:
Junio C Hamano 2010-12-08 11:24:11 -08:00
parent a48aafd31b 07cd726527
commit f04aa35eb6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diff.c
View File

@ -3152,12 +3152,12 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
else if (!prefixcmp(arg, "-B") || !prefixcmp(arg, "--break-rewrites=") ||
!strcmp(arg, "--break-rewrites")) {
if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
return -1;
return error("invalid argument to -B: %s", arg+2);
}
else if (!prefixcmp(arg, "-M") || !prefixcmp(arg, "--detect-renames=") ||
!strcmp(arg, "--detect-renames")) {
if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
return -1;
return error("invalid argument to -M: %s", arg+2);
options->detect_rename = DIFF_DETECT_RENAME;
}
else if (!prefixcmp(arg, "-C") || !prefixcmp(arg, "--detect-copies=") ||
@ -3165,7 +3165,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
if (options->detect_rename == DIFF_DETECT_COPY)
DIFF_OPT_SET(options, FIND_COPIES_HARDER);
if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
return -1;
return error("invalid argument to -C: %s", arg+2);
options->detect_rename = DIFF_DETECT_COPY;
}
else if (!strcmp(arg, "--no-renames"))