From: Martin von Zweigbergk Date: Sun, 29 Jul 2012 23:25:35 +0000 (-0700) Subject: cherry: don't set ignored rev_info options X-Git-Tag: v1.8.0-rc0~126^2~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=38a44bc59ae1ee6bbf7c91de299f6b78ec6e3801;p=git.git cherry: don't set ignored rev_info options 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin/log.c b/builtin/log.c index 7a92e3f57..8cea1e55b 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -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);