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
git-mirror · Mar 7, 2010 · 7b576f9 · 7b576f9
2 parents 7f43e75 + 36c0797
commit 7b576f9
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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) {