diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-25 11:47:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 11:47:23 -0700 |
| commit | cb4575fb181c418a85231ec962c01ef314ec9dfc (patch) | |
| tree | c7de9dc84fd9a533b7b22be1e08c4c014f7ed452 /builtin | |
| parent | Merge branch 'jk/diff-files-assume-unchanged' into maint (diff) | |
| parent | move "--follow needs one pathspec" rule to diff_setup_done (diff) | |
| download | tgif-cb4575fb181c418a85231ec962c01ef314ec9dfc.tar.xz | |
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')
| -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 39e8836352..3b6a6bbadd 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; |