2007-07-14 23:14:45 +00:00
|
|
|
#include "builtin.h"
|
2005-04-17 19:18:17 +00:00
|
|
|
#include "cache.h"
|
2005-04-18 18:39:48 +00:00
|
|
|
#include "commit.h"
|
2008-10-02 12:59:19 +00:00
|
|
|
#include "parse-options.h"
|
2005-04-17 19:18:17 +00:00
|
|
|
|
2008-07-30 05:04:14 +00:00
|
|
|
static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
|
2006-06-29 13:16:46 +00:00
|
|
|
{
|
2008-07-30 05:04:14 +00:00
|
|
|
struct commit_list *result;
|
|
|
|
|
|
|
|
result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1, 0);
|
2006-06-29 13:16:46 +00:00
|
|
|
|
|
|
|
if (!result)
|
|
|
|
return 1;
|
|
|
|
|
2005-08-24 04:08:59 +00:00
|
|
|
while (result) {
|
2006-06-29 13:16:46 +00:00
|
|
|
printf("%s\n", sha1_to_hex(result->item->object.sha1));
|
2005-08-24 04:08:59 +00:00
|
|
|
if (!show_all)
|
|
|
|
return 0;
|
2006-06-29 13:16:46 +00:00
|
|
|
result = result->next;
|
2005-08-24 04:08:59 +00:00
|
|
|
}
|
2006-06-29 13:16:46 +00:00
|
|
|
|
2005-08-24 04:08:59 +00:00
|
|
|
return 0;
|
2005-04-17 19:18:17 +00:00
|
|
|
}
|
|
|
|
|
2008-10-02 12:59:19 +00:00
|
|
|
static const char * const merge_base_usage[] = {
|
2012-08-20 12:32:22 +00:00
|
|
|
N_("git merge-base [-a|--all] <commit> <commit>..."),
|
|
|
|
N_("git merge-base [-a|--all] --octopus <commit>..."),
|
|
|
|
N_("git merge-base --independent <commit>..."),
|
2012-09-11 18:35:26 +00:00
|
|
|
N_("git merge-base --is-ancestor <commit> <commit>"),
|
2008-10-02 12:59:19 +00:00
|
|
|
NULL
|
|
|
|
};
|
2005-08-24 04:08:59 +00:00
|
|
|
|
2008-07-29 05:42:53 +00:00
|
|
|
static struct commit *get_commit_reference(const char *arg)
|
|
|
|
{
|
|
|
|
unsigned char revkey[20];
|
|
|
|
struct commit *r;
|
|
|
|
|
|
|
|
if (get_sha1(arg, revkey))
|
|
|
|
die("Not a valid object name %s", arg);
|
|
|
|
r = lookup_commit_reference(revkey);
|
|
|
|
if (!r)
|
|
|
|
die("Not a valid commit name %s", arg);
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2010-08-17 07:01:54 +00:00
|
|
|
static int handle_octopus(int count, const char **args, int reduce, int show_all)
|
2010-08-17 07:01:15 +00:00
|
|
|
{
|
|
|
|
struct commit_list *revs = NULL;
|
|
|
|
struct commit_list *result;
|
|
|
|
int i;
|
|
|
|
|
2010-08-17 07:01:54 +00:00
|
|
|
if (reduce)
|
|
|
|
show_all = 1;
|
|
|
|
|
|
|
|
for (i = count - 1; i >= 0; i--)
|
2010-08-17 07:01:15 +00:00
|
|
|
commit_list_insert(get_commit_reference(args[i]), &revs);
|
2010-08-17 07:01:54 +00:00
|
|
|
|
|
|
|
result = reduce ? reduce_heads(revs) : get_octopus_merge_bases(revs);
|
2010-08-17 07:01:15 +00:00
|
|
|
|
|
|
|
if (!result)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
while (result) {
|
|
|
|
printf("%s\n", sha1_to_hex(result->item->object.sha1));
|
|
|
|
if (!show_all)
|
|
|
|
return 0;
|
|
|
|
result = result->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-08-30 21:52:20 +00:00
|
|
|
static int handle_is_ancestor(int argc, const char **argv)
|
|
|
|
{
|
|
|
|
struct commit *one, *two;
|
|
|
|
|
|
|
|
if (argc != 2)
|
|
|
|
die("--is-ancestor takes exactly two commits");
|
|
|
|
one = get_commit_reference(argv[0]);
|
|
|
|
two = get_commit_reference(argv[1]);
|
|
|
|
if (in_merge_bases(one, two))
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2007-01-09 08:50:02 +00:00
|
|
|
int cmd_merge_base(int argc, const char **argv, const char *prefix)
|
2005-04-17 19:18:17 +00:00
|
|
|
{
|
2008-07-30 05:04:14 +00:00
|
|
|
struct commit **rev;
|
|
|
|
int rev_nr = 0;
|
2007-01-09 08:50:02 +00:00
|
|
|
int show_all = 0;
|
2010-08-17 07:01:15 +00:00
|
|
|
int octopus = 0;
|
2010-08-17 07:01:54 +00:00
|
|
|
int reduce = 0;
|
2012-08-30 21:52:20 +00:00
|
|
|
int is_ancestor = 0;
|
2005-04-17 19:18:17 +00:00
|
|
|
|
2008-10-02 12:59:19 +00:00
|
|
|
struct option options[] = {
|
2012-08-20 12:32:22 +00:00
|
|
|
OPT_BOOLEAN('a', "all", &show_all, N_("output all common ancestors")),
|
|
|
|
OPT_BOOLEAN(0, "octopus", &octopus, N_("find ancestors for a single n-way merge")),
|
|
|
|
OPT_BOOLEAN(0, "independent", &reduce, N_("list revs not reachable from others")),
|
2012-08-30 21:52:20 +00:00
|
|
|
OPT_BOOLEAN(0, "is-ancestor", &is_ancestor,
|
2012-09-11 18:35:26 +00:00
|
|
|
N_("is the first one ancestor of the other?")),
|
2008-10-02 12:59:19 +00:00
|
|
|
OPT_END()
|
|
|
|
};
|
2008-07-30 05:04:14 +00:00
|
|
|
|
2008-10-02 12:59:19 +00:00
|
|
|
git_config(git_default_config, NULL);
|
2009-05-23 18:53:12 +00:00
|
|
|
argc = parse_options(argc, argv, prefix, options, merge_base_usage, 0);
|
2010-08-17 07:01:54 +00:00
|
|
|
if (!octopus && !reduce && argc < 2)
|
2008-10-02 12:59:19 +00:00
|
|
|
usage_with_options(merge_base_usage, options);
|
2013-06-13 18:19:44 +00:00
|
|
|
if (is_ancestor && (show_all || octopus || reduce))
|
2012-08-30 21:52:20 +00:00
|
|
|
die("--is-ancestor cannot be used with other options");
|
|
|
|
if (is_ancestor)
|
|
|
|
return handle_is_ancestor(argc, argv);
|
2010-08-17 07:01:54 +00:00
|
|
|
if (reduce && (show_all || octopus))
|
|
|
|
die("--independent cannot be used with other options");
|
2010-08-17 07:01:15 +00:00
|
|
|
|
2010-08-17 07:01:54 +00:00
|
|
|
if (octopus || reduce)
|
|
|
|
return handle_octopus(argc, argv, reduce, show_all);
|
2010-08-17 07:01:15 +00:00
|
|
|
|
2008-10-02 12:59:19 +00:00
|
|
|
rev = xmalloc(argc * sizeof(*rev));
|
|
|
|
while (argc-- > 0)
|
|
|
|
rev[rev_nr++] = get_commit_reference(*argv++);
|
2008-07-30 05:04:14 +00:00
|
|
|
return show_merge_base(rev, rev_nr, show_all);
|
2005-04-17 19:18:17 +00:00
|
|
|
}
|