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>
Martin von Zweigbergk committed
Jul 29, 2012 at 16:25 UTC
38a44bc59ae1ee6bbf7c91de299f6b78ec6e3801
1 file changed
-4
builtin/log.c
-4
@@ -1508,10 +1508,6 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
1508
}
1509
1510
init_revisions(&revs, prefix);
1511
- revs.diff = 1;
1512
- revs.combine_merges = 0;
1513
- revs.ignore_merges = 1;
1514
- DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
1511
1512
if (add_pending_commit(head, &revs, 0))
1513
die(_("Unknown commit %s"), head);