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

gitster · gitster · commit 712d35257701 · 2010-03-04T22:26:44.000-08:00
* tr/maint-cherry-pick-list:
  cherry_pick_list: quit early if one side is empty
diff --git a/revision.c b/revision.c
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -547,6 +547,9 @@ static void cherry_pick_list(struct commit_list list, struct rev_info revs)`
`547`	`547`	`right_count++;`
`548`	`548`	`}`
`549`	`549`
	`550`	`+ if (!left_count \|\| !right_count)`
	`551`	`+ return;`
	`552`	`+`
`550`	`553`	`left_first = left_count < right_count;`
`551`	`554`	`init_patch_ids(&ids);`
`552`	`555`	`if (revs->diffopt.nr_paths) {`