diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:44:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:44:10 -0800 |
| commit | 68a47414846dc62ccc41e41a2f5ba55f80e226b3 (patch) | |
| tree | 50498a7a7b4cf15e0d77c051cc67b1e54cf88656 | |
| parent | 32ae5b342545f168b6006bcd8974cc96650d083d (diff) | |
| parent | 36c079756f9f3ad0bbbe2097550c62427670146b (diff) | |
| download | git-68a47414846dc62ccc41e41a2f5ba55f80e226b3.tar.gz git-68a47414846dc62ccc41e41a2f5ba55f80e226b3.tar.xz | |
Merge branch 'tr/maint-cherry-pick-list'
* 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 438cc87b1..29721ecf8 100644 --- 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) { |