diff options
| author | Jeff King <peff@peff.net> | 2014-05-20 02:49:20 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-20 11:09:03 -0700 |
| commit | dd63f169d9381a77db469325688a2bef1a79a9e1 (patch) | |
| tree | 9f67675b9d77ce9ec6cf4003b8b57181915d86de /builtin/log.c | |
| parent | 7bbc4e8fdb33e0a8e42e77cc05460d4c4f615f4d (diff) | |
| download | git-dd63f169d9381a77db469325688a2bef1a79a9e1.tar.gz git-dd63f169d9381a77db469325688a2bef1a79a9e1.tar.xz | |
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>
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/builtin/log.c b/builtin/log.c index b708517a3..00a4ce602 100644 --- 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; |