From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Nov 2010 18:39:06 +0000 (-0700)
Subject: Merge branch 'jk/diff-CBM' into next
X-Git-Tag: ko-next~173
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9d1ec144ab2189f2c245fbdb15c0e0fe2c425a41;p=git.git

Merge branch 'jk/diff-CBM' into next

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

9d1ec144ab2189f2c245fbdb15c0e0fe2c425a41
diff --cc diff.c
index d1c6b9198,84876431b..e995751bd
--- a/diff.c
+++ b/diff.c
@@@ -3140,19 -3140,16 +3140,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)