path: root/builtin/merge-base.c
diff options
authorJunio C Hamano <>2013-12-30 19:58:54 (GMT)
committerJunio C Hamano <>2013-12-30 19:58:54 (GMT)
commit8f29299136c2f11730d876cd62637a9e37d4c388 (patch)
treeac280cc71420d0c203aea01600957d7e1b165f64 /builtin/merge-base.c
parente2f5df42449ace700e5a237f604c34b4657c0edf (diff)
merge-base --octopus: reduce the result from get_octopus_merge_bases()
Scripts that use "merge-base --octopus" could do the reducing themselves, but most of them are expected to want to get the reduced results without having to do any work themselves. Tests are taken from a message by Василий Макаров <> Signed-off-by: Junio C Hamano <> --- We might want to vet the existing callers of the underlying get_octopus_merge_bases() and find out if _all_ of them are doing anything extra (like deduping) because the machinery can return duplicate results. And if that is the case, then we may want to move the dedupling down the callchain instead of having it here.
Diffstat (limited to 'builtin/merge-base.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index daa96c7..87f4dbc 100644
--- 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;