commit b0e2c999af7aa69a0b8d9677107d4c09938e528a
author Junio C Hamano <gitster@pobox.com> Mon Jun 16 10:07:09 2014 -0700
committer Junio C Hamano <gitster@pobox.com> Mon Jun 16 10:07:09 2014 -0700
tree fb8ea45a1fb8ea9a9cd1f75e0650da53e9316ded
parent b83163643bd7459385003fa58ae049a31f2984cb
parent dd63f169d9381a77db469325688a2bef1a79a9e1

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

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

diff.c

diff --git a/diff.c b/diff.c
index f66716f..de25819 100644
--- a/diff.c
+++ b/diff.c
@@ -3320,6 +3320,9 @@
 	}
 
 	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)