From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Dec 2010 19:24:11 +0000 (-0800)
Subject: Merge branch 'jk/diff-CBM'
X-Git-Tag: v1.7.4-rc0~83
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f04aa35eb6117d99f5abf9630961b2c2651d3ed1;p=git.git

Merge branch 'jk/diff-CBM'

* jk/diff-CBM:
  diff: report bogus input to -C/-M/-B
---

f04aa35eb6117d99f5abf9630961b2c2651d3ed1
diff --cc diff.c
index db5e84443,84876431b..6991ed4e1
--- a/diff.c
+++ b/diff.c
@@@ -3149,19 -3140,16 +3149,19 @@@ int diff_opt_parse(struct diff_options 
  		return stat_opt(options, av);
  
  	/* renames options */
 -	else if (!prefixcmp(arg, "-B")) {
 +	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")) {
 +	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")) {
 +	else if (!prefixcmp(arg, "-C") || !prefixcmp(arg, "--detect-copies=") ||
 +		 !strcmp(arg, "--detect-copies")) {
  		if (options->detect_rename == DIFF_DETECT_COPY)
  			DIFF_OPT_SET(options, FIND_COPIES_HARDER);
  		if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)