[PATCH v2 2/3] cherry: don't set ignored rev_info options

From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Jul 29, 2012, 23:25 UTC
Message-ID: <1343604336-7966-3-git-send-email-martin.von.zweigbergk@gmail.com>
In-Reply-To: <1343604336-7966-1-git-send-email-martin.von.zweigbergk@gmail.com>

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>
---
 builtin/log.c | 4 ----
 1 file changed, 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);

-- 
1.7.11.1.104.ge7b44f1