Merge branch 'maint'

diff --git a/revision.c b/revision.c
index 438cc87b17fa3a5a7b57c3fcdf4289cd869b79a7..29721ecf84316d01b18ffdee8bdefa8dbb3887db 100644 (file)
--- 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) {