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

gitster · gitster · commit b0e2c999af7a · 2014-06-16T10:07:09.000-07:00
* jk/diff-follow-must-take-one-pathspec:
  move "--follow needs one pathspec" rule to diff_setup_done
diff --git a/builtin/log.c b/builtin/log.c
@@ -158,13 +158,9 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 	if (rev->show_notes)
 		init_display_notes(&rev->notes_opt);
 
-	if (rev->diffopt.pickaxe || rev->diffopt.filter)
+	if (rev->diffopt.pickaxe || rev->diffopt.filter ||
+	    DIFF_OPT_TST(&rev->diffopt, FOLLOW_RENAMES))
 		rev->always_show_header = 0;
-	if (DIFF_OPT_TST(&rev->diffopt, FOLLOW_RENAMES)) {
-		rev->always_show_header = 0;
-		if (rev->diffopt.pathspec.nr != 1)
-			usage("git logs can only follow renames on one pathname at a time");
-	}
 
 	if (source)
 		rev->show_source = 1;
diff --git a/diff.c b/diff.c
@@ -3320,6 +3320,9 @@ void diff_setup_done(struct diff_options *options)
 	}
 
 	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)

Original file line number	Diff line number	Diff line change
`@@ -3320,6 +3320,9 @@ void diff_setup_done(struct diff_options *options)`
`3320`	`3320`	`}`
`3321`	`3321`
`3322`	`3322`	`options->diff_path_counter = 0;`
	`3323`	`+`
	`3324`	`+ if (DIFF_OPT_TST(options, FOLLOW_RENAMES) && options->pathspec.nr != 1)`
	`3325`	`+ die(_("--follow requires exactly one pathspec"));`
`3323`	`3326`	`}`
`3324`	`3327`
`3325`	`3328`	`static int opt_arg(const char arg, int arg_short, const char arg_long, int *val)`