summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-16 17:07:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-16 17:07:09 (GMT)
commitb0e2c999af7aa69a0b8d9677107d4c09938e528a (patch)
treefb8ea45a1fb8ea9a9cd1f75e0650da53e9316ded /builtin/log.c
parentb83163643bd7459385003fa58ae049a31f2984cb (diff)
parentdd63f169d9381a77db469325688a2bef1a79a9e1 (diff)
downloadgit-b0e2c999af7aa69a0b8d9677107d4c09938e528a.zip
git-b0e2c999af7aa69a0b8d9677107d4c09938e528a.tar.gz
git-b0e2c999af7aa69a0b8d9677107d4c09938e528a.tar.bz2
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
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;