OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
7f43e75
)
Merge branch 'tr/maint-cherry-pick-list' into maint-1.6.6
author
Junio C Hamano
<gitster@pobox.com>
Sun, 7 Mar 2010 22:53:40 +0000
(14:53 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 7 Mar 2010 22:53:40 +0000
(14:53 -0800)
* tr/maint-cherry-pick-list:
cherry_pick_list: quit early if one side is empty
revision.c
patch
|
blob
|
history
diff --git
a/revision.c
b/revision.c
index
34f9ab9
..
c92ffc2
100644
(file)
--- 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) {