summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-08 11:24:11 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-08 11:24:11 -0800
commitf04aa35eb6117d99f5abf9630961b2c2651d3ed1 (patch)
tree80039e4c8aa5f45100f8a8fb48a75acf0fef78a6 /diff.c
parenta48aafd31b19cd7b2d1812dc5d207acb50781dfc (diff)
parent07cd7265274ba6aed2589e6b22eae7d413640037 (diff)
downloadgit-f04aa35eb6117d99f5abf9630961b2c2651d3ed1.tar.gz
Merge branch 'jk/diff-CBM'
* jk/diff-CBM: diff: report bogus input to -C/-M/-B
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/diff.c b/diff.c
index db5e84443b..6991ed4e17 100644
--- a/diff.c
+++ b/diff.c
@@ -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"))