move "--follow needs one pathspec" rule to diff_setup_done
Because of the way "--follow" is implemented, we must have exactly one pathspec. "git log" enforces this restriction, but other users of the revision traversal code do not. For example, "git format-patch --follow" will segfault during try_to_follow_renames, as we have no pathspecs at all. We can push this check down into diff_setup_done, which is probably a better place anyway. It is the diff code that introduces this restriction, so other parts of the code should not need to care themselves. Reported-by: "Michael S. Tsirkin" <mst@redhat.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
May 20, 2014 at 02:49 UTC
dd63f169d9381a77db469325688a2bef1a79a9e1
2 files changed
+5
-6
builtin/log.c
+2
-6
@@ -158,13 +158,9 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
158
if (rev->show_notes)
159
init_display_notes(&rev->notes_opt);
160
161
- if (rev->diffopt.pickaxe || rev->diffopt.filter)
161
+ if (rev->diffopt.pickaxe || rev->diffopt.filter ||
162
+ DIFF_OPT_TST(&rev->diffopt, FOLLOW_RENAMES))
163
rev->always_show_header = 0;
163
- if (DIFF_OPT_TST(&rev->diffopt, FOLLOW_RENAMES)) {
164
- rev->always_show_header = 0;
165
- if (rev->diffopt.pathspec.nr != 1)
166
- usage("git logs can only follow renames on one pathname at a time");
167
- }
164
165
if (source)
166
rev->show_source = 1;
diff.c
+3
@@ -3317,6 +3317,9 @@ void diff_setup_done(struct diff_options *options)
3317
options->output_format = DIFF_FORMAT_NO_OUTPUT;
3318
DIFF_OPT_SET(options, EXIT_WITH_STATUS);
3319
}
3320
+
3321
+ if (DIFF_OPT_TST(options, FOLLOW_RENAMES) && options->pathspec.nr != 1)
3322
+ die(_("--follow requires exactly one pathspec"));
3323
}
3324
3325
static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)