1#include "builtin.h"
2#include "cache.h"
3#include "config.h"
4#include "commit.h"
5#include "refs.h"
6#include "diff.h"
7#include "revision.h"
8#include "parse-options.h"
9#include "repository.h"
1011
static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
12{
13struct commit_list *result, *r;
1415
result = get_merge_bases_many_dirty(rev[0], rev_nr - 1, rev + 1);
1617
if (!result)
18return 1;
1920
for (r = result; r; r = r->next) {
21printf("%s\n", oid_to_hex(&r->item->object.oid));
22if (!show_all)
23break;
24}
2526
free_commit_list(result);
27return 0;
28}
2930
static const char * const merge_base_usage[] = {
31N_("git merge-base [-a | --all] <commit> <commit>..."),
32N_("git merge-base [-a | --all] --octopus <commit>..."),
33N_("git merge-base --independent <commit>..."),
34N_("git merge-base --is-ancestor <commit> <commit>"),
35N_("git merge-base --fork-point <ref> [<commit>]"),
36NULL
37};
3839
static struct commit *get_commit_reference(const char *arg)
40{
41struct object_id revkey;
42struct commit *r;
4344
if (get_oid(arg, &revkey))
45die("Not a valid object name %s", arg);
46r = lookup_commit_reference(the_repository, &revkey);
47if (!r)
48die("Not a valid commit name %s", arg);
4950
return r;
51}
5253
static int handle_independent(int count, const char **args)
54{
55struct commit_list *revs = NULL, *rev;
56int i;
5758
for (i = count - 1; i >= 0; i--)
59commit_list_insert(get_commit_reference(args[i]), &revs);
6061
reduce_heads_replace(&revs);
6263
if (!revs)
64return 1;
6566
for (rev = revs; rev; rev = rev->next)
67printf("%s\n", oid_to_hex(&rev->item->object.oid));
6869
free_commit_list(revs);
70return 0;
71}
7273
static int handle_octopus(int count, const char **args, int show_all)
74{
75struct commit_list *revs = NULL;
76struct commit_list *result, *rev;
77int i;
7879
for (i = count - 1; i >= 0; i--)
80commit_list_insert(get_commit_reference(args[i]), &revs);
8182
result = get_octopus_merge_bases(revs);
83free_commit_list(revs);
84reduce_heads_replace(&result);
8586
if (!result)
87return 1;
8889
for (rev = result; rev; rev = rev->next) {
90printf("%s\n", oid_to_hex(&rev->item->object.oid));
91if (!show_all)
92break;
93}
9495
free_commit_list(result);
96return 0;
97}
9899
static int handle_is_ancestor(int argc, const char **argv)
100{
101struct commit *one, *two;
102103
if (argc != 2)
104die("--is-ancestor takes exactly two commits");
105one = get_commit_reference(argv[0]);
106two = get_commit_reference(argv[1]);
107if (in_merge_bases(one, two))
108return 0;
109else
110return 1;
111}
112113
struct rev_collect {
114struct commit **commit;
115int nr;
116int alloc;
117unsigned int initial : 1;
118};
119120
static void add_one_commit(struct object_id *oid, struct rev_collect *revs)
121{
122struct commit *commit;
123124
if (is_null_oid(oid))
125return;
126127
commit = lookup_commit(oid);
128if (!commit ||
129(commit->object.flags & TMP_MARK) ||
130parse_commit(commit))
131return;
132133
ALLOC_GROW(revs->commit, revs->nr + 1, revs->alloc);
134revs->commit[revs->nr++] = commit;
135commit->object.flags |= TMP_MARK;
136}
137138
static int collect_one_reflog_ent(struct object_id *ooid, struct object_id *noid,
139const char *ident, timestamp_t timestamp,
140int tz, const char *message, void *cbdata)
141{
142struct rev_collect *revs = cbdata;
143144
if (revs->initial) {
145revs->initial = 0;
146add_one_commit(ooid, revs);
147}
148add_one_commit(noid, revs);
149return 0;
150}
151152
static int handle_fork_point(int argc, const char **argv)
153{
154struct object_id oid;
155char *refname;
156const char *commitname;
157struct rev_collect revs;
158struct commit *derived;
159struct commit_list *bases;
160int i, ret = 0;
161162
switch (dwim_ref(argv[0], strlen(argv[0]), &oid, &refname)) {
163case 0:
164die("No such ref: '%s'", argv[0]);
165case 1:
166break; /* good */
167default:
168die("Ambiguous refname: '%s'", argv[0]);
169}
170171
commitname = (argc == 2) ? argv[1] : "HEAD";
172if (get_oid(commitname, &oid))
173die("Not a valid object name: '%s'", commitname);
174175
derived = lookup_commit_reference(the_repository, &oid);
176memset(&revs, 0, sizeof(revs));
177revs.initial = 1;
178for_each_reflog_ent(refname, collect_one_reflog_ent, &revs);
179180
if (!revs.nr && !get_oid(refname, &oid))
181add_one_commit(&oid, &revs);
182183
for (i = 0; i < revs.nr; i++)
184revs.commit[i]->object.flags &= ~TMP_MARK;
185186
bases = get_merge_bases_many_dirty(derived, revs.nr, revs.commit);
187188
/*
189* There should be one and only one merge base, when we found
190* a common ancestor among reflog entries.
191*/
192if (!bases || bases->next) {
193ret = 1;
194goto cleanup_return;
195}
196197
/* And the found one must be one of the reflog entries */
198for (i = 0; i < revs.nr; i++)
199if (&bases->item->object == &revs.commit[i]->object)
200break; /* found */
201if (revs.nr <= i) {
202ret = 1; /* not found */
203goto cleanup_return;
204}
205206
printf("%s\n", oid_to_hex(&bases->item->object.oid));
207208
cleanup_return:
209free_commit_list(bases);
210return ret;
211}
212213
int cmd_merge_base(int argc, const char **argv, const char *prefix)
214{
215struct commit **rev;
216int rev_nr = 0;
217int show_all = 0;
218int cmdmode = 0;
219220
struct option options[] = {
221OPT_BOOL('a', "all", &show_all, N_("output all common ancestors")),
222OPT_CMDMODE(0, "octopus", &cmdmode,
223N_("find ancestors for a single n-way merge"), 'o'),
224OPT_CMDMODE(0, "independent", &cmdmode,
225N_("list revs not reachable from others"), 'r'),
226OPT_CMDMODE(0, "is-ancestor", &cmdmode,
227N_("is the first one ancestor of the other?"), 'a'),
228OPT_CMDMODE(0, "fork-point", &cmdmode,
229N_("find where <commit> forked from reflog of <ref>"), 'f'),
230OPT_END()
231};
232233
git_config(git_default_config, NULL);
234argc = parse_options(argc, argv, prefix, options, merge_base_usage, 0);
235236
if (cmdmode == 'a') {
237if (argc < 2)
238usage_with_options(merge_base_usage, options);
239if (show_all)
240die("--is-ancestor cannot be used with --all");
241return handle_is_ancestor(argc, argv);
242}
243244
if (cmdmode == 'r' && show_all)
245die("--independent cannot be used with --all");
246247
if (cmdmode == 'o')
248return handle_octopus(argc, argv, show_all);
249250
if (cmdmode == 'r')
251return handle_independent(argc, argv);
252253
if (cmdmode == 'f') {
254if (argc < 1 || 2 < argc)
255usage_with_options(merge_base_usage, options);
256return handle_fork_point(argc, argv);
257}
258259
if (argc < 2)
260usage_with_options(merge_base_usage, options);
261262
ALLOC_ARRAY(rev, argc);
263while (argc-- > 0)
264rev[rev_nr++] = get_commit_reference(*argv++);
265return show_merge_base(rev, rev_nr, show_all);
266}