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

* tr/maint-cherry-pick-list: cherry_pick_list: quit early if one side is empty
15 years ago · 712d352577
1 changed files with 3 additions and 0 deletions
--- a/revision.c
+++ b/revision.c
@ -547,6 +547,9 @@ static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
				@@ -547,6 +547,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) {