Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
merge-base --octopus: reduce the result from get_octopus_merge_bases()
[gitweb.git]
/
builtin
/
merge-base.c
diff --git
a/builtin/merge-base.c
b/builtin/merge-base.c
index daa96c79092933ed13dfc67f26062b2c308eb80a..87f4dbccaeae39e7bd52e89f368357d58bc20037 100644
(file)
--- a/
builtin/merge-base.c
+++ b/
builtin/merge-base.c
@@
-73,7
+73,7
@@
static int handle_octopus(int count, const char **args, int show_all)
for (i = count - 1; i >= 0; i--)
commit_list_insert(get_commit_reference(args[i]), &revs);
- result =
get_octopus_merge_bases(revs
);
+ result =
reduce_heads(get_octopus_merge_bases(revs)
);
if (!result)
return 1;