undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tr/maint-cherry-pick-list' into maint-1.6.6

Browse Source 
* tr/maint-cherry-pick-list:
  cherry_pick_list: quit early if one side is empty
This commit is contained in:
Junio C Hamano 2010-03-07 14:53:40 -08:00
commit 7b576f9910
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
revision.c
View File

@ -536,6 +536,9 @@ static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
right_count++; right_count++;
} }
if (!left_count || !right_count)
return;
left_first = left_count < right_count; left_first = left_count < right_count;
init_patch_ids(&ids); init_patch_ids(&ids);
if (revs->diffopt.nr_paths) { if (revs->diffopt.nr_paths) {