Skip to content

Commit

Permalink
cherry: don't set ignored rev_info options
Browse files Browse the repository at this point in the history
Ever since cherry was built-in in e827633 (Built-in cherry,
2006-10-24), it has set a bunch of options on the the rev_info that
are only used while outputting a patch. But since the built-in cherry
command never needs to output any patch (it uses add_commit_patch_id
and has_commit_patch_id instead), these options are just distractions,
so remove them.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Martin von Zweigbergk authored and Junio C Hamano committed Jul 30, 2012
1 parent 811929f commit 38a44bc
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions builtin/log.c
Original file line number Diff line number Diff line change
Expand Up @@ -1508,10 +1508,6 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
}

init_revisions(&revs, prefix);
revs.diff = 1;
revs.combine_merges = 0;
revs.ignore_merges = 1;
DIFF_OPT_SET(&revs.diffopt, RECURSIVE);

if (add_pending_commit(head, &revs, 0))
die(_("Unknown commit %s"), head);
Expand Down

0 comments on commit 38a44bc

Please sign in to comment.