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

gitster · gitster · commit 7b576f9910a2 · 2010-03-07T14:53:40.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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -536,6 +536,9 @@ static void cherry_pick_list(struct commit_list list, struct rev_info revs)`
`536`	`536`	`right_count++;`
`537`	`537`	`}`
`538`	`538`
	`539`	`+ if (!left_count \|\| !right_count)`
	`540`	`+ return;`
	`541`	`+`
`539`	`542`	`left_first = left_count < right_count;`
`540`	`543`	`init_patch_ids(&ids);`
`541`	`544`	`if (revs->diffopt.nr_paths) {`