summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-25 18:47:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-25 18:47:23 (GMT)
commitcb4575fb181c418a85231ec962c01ef314ec9dfc (patch)
treec7de9dc84fd9a533b7b22be1e08c4c014f7ed452 /builtin/log.c
parent11aae3e1c17bca8e7057d99a071815ee3c526d16 (diff)
parentdd63f169d9381a77db469325688a2bef1a79a9e1 (diff)
downloadgit-cb4575fb181c418a85231ec962c01ef314ec9dfc.zip
git-cb4575fb181c418a85231ec962c01ef314ec9dfc.tar.gz
git-cb4575fb181c418a85231ec962c01ef314ec9dfc.tar.bz2
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
Diffstat (limited to 'builtin/log.c')
-rw-r--r--builtin/log.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/builtin/log.c b/builtin/log.c
index 39e8836..3b6a6bb 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;