summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>2012-07-29 23:25:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-30 00:37:11 (GMT)
commit38a44bc59ae1ee6bbf7c91de299f6b78ec6e3801 (patch)
tree95a2f955bae790217fef64d623effda11fdeed43 /builtin/log.c
parent811929f1695ed7de15cad14b9335534af672b472 (diff)
downloadgit-38a44bc59ae1ee6bbf7c91de299f6b78ec6e3801.zip
git-38a44bc59ae1ee6bbf7c91de299f6b78ec6e3801.tar.gz
git-38a44bc59ae1ee6bbf7c91de299f6b78ec6e3801.tar.bz2
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 <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/log.c')
-rw-r--r--builtin/log.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/builtin/log.c b/builtin/log.c
index 7a92e3f..8cea1e5 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);