Skip to content

Commit

Permalink
Merge branch 'jk/diff-follow-must-take-one-pathspec'
Browse files Browse the repository at this point in the history
* jk/diff-follow-must-take-one-pathspec:
  move "--follow needs one pathspec" rule to diff_setup_done
  • Loading branch information
Junio C Hamano committed Jun 16, 2014
2 parents b831636 + dd63f16 commit b0e2c99
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
8 changes: 2 additions & 6 deletions builtin/log.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -3320,6 +3320,9 @@ void diff_setup_done(struct diff_options *options)
}

options->diff_path_counter = 0;

if (DIFF_OPT_TST(options, FOLLOW_RENAMES) && options->pathspec.nr != 1)
die(_("--follow requires exactly one pathspec"));
}

static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
Expand Down

0 comments on commit b0e2c99

Please sign in to comment.