Merge branch 'tr/maint-cherry-pick-list' into maint-1.6.6
authorJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 22:53:40 +0000 (14:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 22:53:40 +0000 (14:53 -0800)
* tr/maint-cherry-pick-list:
  cherry_pick_list: quit early if one side is empty

revision.c

index 34f9ab9..c92ffc2 100644 (file)
@@ -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) {