From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jun 2014 18:47:23 +0000 (-0700)
Subject: Merge branch 'jk/diff-follow-must-take-one-pathspec' into maint
X-Git-Tag: v2.0.1~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb4575fb181c418a85231ec962c01ef314ec9dfc;p=thirdparty%2Fgit.git

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

"git format-patch" did not enforce the rule that the "--follow"
option from the log/diff family of commands must be used with
exactly one pathspec.

* jk/diff-follow-must-take-one-pathspec:
  move "--follow needs one pathspec" rule to diff_setup_done
---

cb4575fb181c418a85231ec962c01ef314ec9dfc
diff --cc diff.c
index f72769a1c4,a99b925ac7..68bb8c5a84
--- a/diff.c
+++ b/diff.c
@@@ -3324,7 -3318,8 +3324,10 @@@ void diff_setup_done(struct diff_option
  		DIFF_OPT_SET(options, EXIT_WITH_STATUS);
  	}
  
 +	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)