From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 7 Mar 2010 22:53:40 +0000 (-0800)
Subject: Merge branch 'tr/maint-cherry-pick-list' into maint-1.6.6
X-Git-Tag: v1.7.0.3~33^2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7b576f9910a2945688f04f6ff9d03771f2956618?hp=7f43e75adc1c238f27a89b4e7a30a1c874fd01f9

Merge branch 'tr/maint-cherry-pick-list' into maint-1.6.6

* tr/maint-cherry-pick-list:
cherry_pick_list: quit early if one side is empty
---

diff --git a/revision.c b/revision.c
index 34f9ab98d1..c92ffc2a58 100644
--- a/revision.c
+++ b/revision.c
@@ -536,6 +536,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) {