From: Thomas Rast <trast@student.ethz.ch>
Date: Sat, 20 Feb 2010 11:42:04 +0000 (+0100)
Subject: cherry_pick_list: quit early if one side is empty
X-Git-Tag: v1.7.0.2~7^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=36c079756f9f3ad0bbbe2097550c62427670146b;p=git.git

cherry_pick_list: quit early if one side is empty

The --cherry-pick logic starts by counting the commits on each side,
so that it can filter away commits on the bigger one.  However, so
far it missed an opportunity for optimization: it doesn't need to do
any work if either side is empty.

This in particular helps the common use-case 'git rebase -i HEAD~$n':
it internally uses --cherry-pick, but since HEAD~$n is a direct
ancestor the left side is always empty.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/revision.c b/revision.c
index e75079a6e..c2fad2fd7 100644
--- a/revision.c
+++ b/revision.c
@@ -514,6 +514,9 @@ static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
 			right_count++;
 	}
 
+	if (!left_count || !right_count)
+		return;
+
 	left_first = left_count < right_count;
 	init_patch_ids(&ids);
 	if (revs->diffopt.nr_paths) {