7 #include "parse-options.h"
9 static int show_merge_base(struct commit
**rev
, int rev_nr
, int show_all
)
11 struct commit_list
*result
;
13 result
= get_merge_bases_many(rev
[0], rev_nr
- 1, rev
+ 1, 0);
19 printf("%s\n", sha1_to_hex(result
->item
->object
.sha1
));
22 result
= result
->next
;
28 static const char * const merge_base_usage
[] = {
29 N_("git merge-base [-a|--all] <commit> <commit>..."),
30 N_("git merge-base [-a|--all] --octopus <commit>..."),
31 N_("git merge-base --independent <commit>..."),
32 N_("git merge-base --is-ancestor <commit> <commit>"),
33 N_("git merge-base --fork-point <ref> [<commit>]"),
37 static struct commit
*get_commit_reference(const char *arg
)
39 unsigned char revkey
[20];
42 if (get_sha1(arg
, revkey
))
43 die("Not a valid object name %s", arg
);
44 r
= lookup_commit_reference(revkey
);
46 die("Not a valid commit name %s", arg
);
51 static int handle_octopus(int count
, const char **args
, int reduce
, int show_all
)
53 struct commit_list
*revs
= NULL
;
54 struct commit_list
*result
;
60 for (i
= count
- 1; i
>= 0; i
--)
61 commit_list_insert(get_commit_reference(args
[i
]), &revs
);
63 result
= reduce
? reduce_heads(revs
) : get_octopus_merge_bases(revs
);
69 printf("%s\n", sha1_to_hex(result
->item
->object
.sha1
));
72 result
= result
->next
;
78 static int handle_is_ancestor(int argc
, const char **argv
)
80 struct commit
*one
, *two
;
83 die("--is-ancestor takes exactly two commits");
84 one
= get_commit_reference(argv
[0]);
85 two
= get_commit_reference(argv
[1]);
86 if (in_merge_bases(one
, two
))
93 struct commit
**commit
;
96 unsigned int initial
: 1;
99 static void add_one_commit(unsigned char *sha1
, struct rev_collect
*revs
)
101 struct commit
*commit
;
103 if (is_null_sha1(sha1
))
106 commit
= lookup_commit(sha1
);
108 (commit
->object
.flags
& TMP_MARK
) ||
109 parse_commit(commit
))
112 ALLOC_GROW(revs
->commit
, revs
->nr
+ 1, revs
->alloc
);
113 revs
->commit
[revs
->nr
++] = commit
;
114 commit
->object
.flags
|= TMP_MARK
;
117 static int collect_one_reflog_ent(unsigned char *osha1
, unsigned char *nsha1
,
118 const char *ident
, unsigned long timestamp
,
119 int tz
, const char *message
, void *cbdata
)
121 struct rev_collect
*revs
= cbdata
;
125 add_one_commit(osha1
, revs
);
127 add_one_commit(nsha1
, revs
);
131 static int handle_fork_point(int argc
, const char **argv
)
133 unsigned char sha1
[20];
135 const char *commitname
;
136 struct rev_collect revs
;
137 struct commit
*derived
;
138 struct commit_list
*bases
;
141 switch (dwim_ref(argv
[0], strlen(argv
[0]), sha1
, &refname
)) {
143 die("No such ref: '%s'", argv
[0]);
147 die("Ambiguous refname: '%s'", argv
[0]);
150 commitname
= (argc
== 2) ? argv
[1] : "HEAD";
151 if (get_sha1(commitname
, sha1
))
152 die("Not a valid object name: '%s'", commitname
);
154 derived
= lookup_commit_reference(sha1
);
155 memset(&revs
, 0, sizeof(revs
));
157 for_each_reflog_ent(refname
, collect_one_reflog_ent
, &revs
);
159 for (i
= 0; i
< revs
.nr
; i
++)
160 revs
.commit
[i
]->object
.flags
&= ~TMP_MARK
;
162 bases
= get_merge_bases_many(derived
, revs
.nr
, revs
.commit
, 0);
165 * There should be one and only one merge base, when we found
166 * a common ancestor among reflog entries.
168 if (!bases
|| bases
->next
) {
173 /* And the found one must be one of the reflog entries */
174 for (i
= 0; i
< revs
.nr
; i
++)
175 if (&bases
->item
->object
== &revs
.commit
[i
]->object
)
178 ret
= 1; /* not found */
182 printf("%s\n", sha1_to_hex(bases
->item
->object
.sha1
));
185 free_commit_list(bases
);
189 int cmd_merge_base(int argc
, const char **argv
, const char *prefix
)
196 struct option options
[] = {
197 OPT_BOOL('a', "all", &show_all
, N_("output all common ancestors")),
198 OPT_CMDMODE(0, "octopus", &cmdmode
,
199 N_("find ancestors for a single n-way merge"), 'o'),
200 OPT_CMDMODE(0, "independent", &cmdmode
,
201 N_("list revs not reachable from others"), 'r'),
202 OPT_CMDMODE(0, "is-ancestor", &cmdmode
,
203 N_("is the first one ancestor of the other?"), 'a'),
204 OPT_CMDMODE(0, "fork-point", &cmdmode
,
205 N_("find where <commit> forked from reflog of <ref>"), 'f'),
209 git_config(git_default_config
, NULL
);
210 argc
= parse_options(argc
, argv
, prefix
, options
, merge_base_usage
, 0);
212 if (cmdmode
== 'a') {
214 usage_with_options(merge_base_usage
, options
);
216 die("--is-ancestor cannot be used with --all");
217 return handle_is_ancestor(argc
, argv
);
220 if (cmdmode
== 'r' && show_all
)
221 die("--independent cannot be used with --all");
223 if (cmdmode
== 'r' || cmdmode
== 'o')
224 return handle_octopus(argc
, argv
, cmdmode
== 'r', show_all
);
226 if (cmdmode
== 'f') {
227 if (argc
< 1 || 2 < argc
)
228 usage_with_options(merge_base_usage
, options
);
229 return handle_fork_point(argc
, argv
);
233 usage_with_options(merge_base_usage
, options
);
235 rev
= xmalloc(argc
* sizeof(*rev
));
237 rev
[rev_nr
++] = get_commit_reference(*argv
++);
238 return show_merge_base(rev
, rev_nr
, show_all
);