10 #include "object-name.h"
11 #include "parse-options.h"
12 #include "repository.h"
13 #include "commit-reach.h"
15 static int show_merge_base(struct commit
**rev
, int rev_nr
, int show_all
)
17 struct commit_list
*result
, *r
;
19 result
= repo_get_merge_bases_many_dirty(the_repository
, rev
[0],
25 for (r
= result
; r
; r
= r
->next
) {
26 printf("%s\n", oid_to_hex(&r
->item
->object
.oid
));
31 free_commit_list(result
);
35 static const char * const merge_base_usage
[] = {
36 N_("git merge-base [-a | --all] <commit> <commit>..."),
37 N_("git merge-base [-a | --all] --octopus <commit>..."),
38 N_("git merge-base --is-ancestor <commit> <commit>"),
39 N_("git merge-base --independent <commit>..."),
40 N_("git merge-base --fork-point <ref> [<commit>]"),
44 static struct commit
*get_commit_reference(const char *arg
)
46 struct object_id revkey
;
49 if (repo_get_oid(the_repository
, arg
, &revkey
))
50 die("Not a valid object name %s", arg
);
51 r
= lookup_commit_reference(the_repository
, &revkey
);
53 die("Not a valid commit name %s", arg
);
58 static int handle_independent(int count
, const char **args
)
60 struct commit_list
*revs
= NULL
, *rev
;
63 for (i
= count
- 1; i
>= 0; i
--)
64 commit_list_insert(get_commit_reference(args
[i
]), &revs
);
66 reduce_heads_replace(&revs
);
71 for (rev
= revs
; rev
; rev
= rev
->next
)
72 printf("%s\n", oid_to_hex(&rev
->item
->object
.oid
));
74 free_commit_list(revs
);
78 static int handle_octopus(int count
, const char **args
, int show_all
)
80 struct commit_list
*revs
= NULL
;
81 struct commit_list
*result
, *rev
;
84 for (i
= count
- 1; i
>= 0; i
--)
85 commit_list_insert(get_commit_reference(args
[i
]), &revs
);
87 result
= get_octopus_merge_bases(revs
);
88 free_commit_list(revs
);
89 reduce_heads_replace(&result
);
94 for (rev
= result
; rev
; rev
= rev
->next
) {
95 printf("%s\n", oid_to_hex(&rev
->item
->object
.oid
));
100 free_commit_list(result
);
104 static int handle_is_ancestor(int argc
, const char **argv
)
106 struct commit
*one
, *two
;
109 die("--is-ancestor takes exactly two commits");
110 one
= get_commit_reference(argv
[0]);
111 two
= get_commit_reference(argv
[1]);
112 if (repo_in_merge_bases(the_repository
, one
, two
))
118 static int handle_fork_point(int argc
, const char **argv
)
120 struct object_id oid
;
121 struct commit
*derived
, *fork_point
;
122 const char *commitname
;
124 commitname
= (argc
== 2) ? argv
[1] : "HEAD";
125 if (repo_get_oid(the_repository
, commitname
, &oid
))
126 die("Not a valid object name: '%s'", commitname
);
128 derived
= lookup_commit_reference(the_repository
, &oid
);
130 fork_point
= get_fork_point(argv
[0], derived
);
135 printf("%s\n", oid_to_hex(&fork_point
->object
.oid
));
139 int cmd_merge_base(int argc
, const char **argv
, const char *prefix
)
147 struct option options
[] = {
148 OPT_BOOL('a', "all", &show_all
, N_("output all common ancestors")),
149 OPT_CMDMODE(0, "octopus", &cmdmode
,
150 N_("find ancestors for a single n-way merge"), 'o'),
151 OPT_CMDMODE(0, "independent", &cmdmode
,
152 N_("list revs not reachable from others"), 'r'),
153 OPT_CMDMODE(0, "is-ancestor", &cmdmode
,
154 N_("is the first one ancestor of the other?"), 'a'),
155 OPT_CMDMODE(0, "fork-point", &cmdmode
,
156 N_("find where <commit> forked from reflog of <ref>"), 'f'),
160 git_config(git_default_config
, NULL
);
161 argc
= parse_options(argc
, argv
, prefix
, options
, merge_base_usage
, 0);
163 if (cmdmode
== 'a') {
165 usage_with_options(merge_base_usage
, options
);
167 die(_("options '%s' and '%s' cannot be used together"),
168 "--is-ancestor", "--all");
169 return handle_is_ancestor(argc
, argv
);
172 if (cmdmode
== 'r' && show_all
)
173 die(_("options '%s' and '%s' cannot be used together"),
174 "--independent", "--all");
177 return handle_octopus(argc
, argv
, show_all
);
180 return handle_independent(argc
, argv
);
182 if (cmdmode
== 'f') {
183 if (argc
< 1 || 2 < argc
)
184 usage_with_options(merge_base_usage
, options
);
185 return handle_fork_point(argc
, argv
);
189 usage_with_options(merge_base_usage
, options
);
191 ALLOC_ARRAY(rev
, argc
);
193 rev
[rev_nr
++] = get_commit_reference(*argv
++);
194 ret
= show_merge_base(rev
, rev_nr
, show_all
);