diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-02-14 01:38:59 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-02-14 01:38:59 +0400 |
commit | 2cd861672e1021012f40597b9b68cc3a9af62e10 (patch) | |
tree | 5638bb031b32cb06df4ec87ff8066c2ca48cd7c9 /builtin | |
parent | 5032098614b6f68258d1f5d13615b9dcbf25f040 (diff) | |
parent | 8f29299136c2f11730d876cd62637a9e37d4c388 (diff) |
Merge branch 'bm/merge-base-octopus-dedup' into maint
"git merge-base --octopus" used to leave cleaning up suboptimal
result to the caller, but now it does the clean-up itself.
* bm/merge-base-octopus-dedup:
merge-base --octopus: reduce the result from get_octopus_merge_bases()
merge-base: separate "--independent" codepath into its own helper
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/merge-base.c | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/builtin/merge-base.c b/builtin/merge-base.c index e88eb93f14..57ac472716 100644 --- a/builtin/merge-base.c +++ b/builtin/merge-base.c @@ -44,19 +44,36 @@ static struct commit *get_commit_reference(const char *arg) return r; } -static int handle_octopus(int count, const char **args, int reduce, int show_all) +static int handle_independent(int count, const char **args) { struct commit_list *revs = NULL; struct commit_list *result; int i; - if (reduce) - show_all = 1; + for (i = count - 1; i >= 0; i--) + commit_list_insert(get_commit_reference(args[i]), &revs); + + result = reduce_heads(revs); + if (!result) + return 1; + + while (result) { + printf("%s\n", sha1_to_hex(result->item->object.sha1)); + result = result->next; + } + return 0; +} + +static int handle_octopus(int count, const char **args, int show_all) +{ + struct commit_list *revs = NULL; + struct commit_list *result; + int i; for (i = count - 1; i >= 0; i--) commit_list_insert(get_commit_reference(args[i]), &revs); - result = reduce ? reduce_heads(revs) : get_octopus_merge_bases(revs); + result = reduce_heads(get_octopus_merge_bases(revs)); if (!result) return 1; @@ -114,8 +131,10 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix) if (reduce && (show_all || octopus)) die("--independent cannot be used with other options"); - if (octopus || reduce) - return handle_octopus(argc, argv, reduce, show_all); + if (octopus) + return handle_octopus(argc, argv, show_all); + else if (reduce) + return handle_independent(argc, argv); rev = xmalloc(argc * sizeof(*rev)); while (argc-- > 0) |