mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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
This commit is contained in:
commit
7b576f9910
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue