diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-07 14:53:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-07 14:53:40 -0800 |
| commit | 7b576f9910a2945688f04f6ff9d03771f2956618 (patch) | |
| tree | 09d886c95b217786a228aff5c694c38eed03bf3e | |
| parent | 7f43e75adc1c238f27a89b4e7a30a1c874fd01f9 (diff) | |
| parent | 36c079756f9f3ad0bbbe2097550c62427670146b (diff) | |
| download | git-7b576f9910a2945688f04f6ff9d03771f2956618.tar.gz git-7b576f9910a2945688f04f6ff9d03771f2956618.tar.xz | |
Merge branch 'tr/maint-cherry-pick-list' into maint-1.6.6
* tr/maint-cherry-pick-list:
cherry_pick_list: quit early if one side is empty
| -rw-r--r-- | revision.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/revision.c b/revision.c index 34f9ab98d..c92ffc2a5 100644 --- 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) { |