[thirdparty/git.git] / builtin / merge-base.c

#include "builtin.h"
#include "cache.h"
#include "commit.h"
#include "parse-options.h"

static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
{
	struct commit_list *result;

	result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1, 0);

	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;
}

static const char * const merge_base_usage[] = {
	"git merge-base [-a|--all] [--octopus] <commit> <commit>...",
	"git merge-base --independent <commit>...",
	NULL
};

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;
}

static int handle_octopus(int count, const char **args, int reduce, int show_all)
{
	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 ? reduce_heads(revs) : get_octopus_merge_bases(revs);

	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;
}

int cmd_merge_base(int argc, const char **argv, const char *prefix)
{
	struct commit **rev;
	int rev_nr = 0;
	int show_all = 0;
	int octopus = 0;
	int reduce = 0;

	struct option options[] = {
		OPT_BOOLEAN('a', "all", &show_all, "output all common ancestors"),
		OPT_BOOLEAN(0, "octopus", &octopus, "find ancestors for a single n-way merge"),
		OPT_BOOLEAN(0, "independent", &reduce, "list revs not reachable from others"),
		OPT_END()
	};

	git_config(git_default_config, NULL);
	argc = parse_options(argc, argv, prefix, options, merge_base_usage, 0);
	if (!octopus && !reduce && argc < 2)
		usage_with_options(merge_base_usage, options);
	if (reduce && (show_all || octopus))
		die("--independent cannot be used with other options");

	if (octopus || reduce)
		return handle_octopus(argc, argv, reduce, show_all);

	rev = xmalloc(argc * sizeof(*rev));
	while (argc-- > 0)
		rev[rev_nr++] = get_commit_reference(*argv++);
	return show_merge_base(rev, rev_nr, show_all);
}
Commit	Line	Data
baffc0e7	1	#include "builtin.h"
6683463e	2	#include "cache.h"
b5039db6	3	#include "commit.h"
e5d1a4df	4	#include "parse-options.h"
6683463e	5
53eda89b	6	static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
52cab8a0	7	{
53eda89b CC	8	struct commit_list *result;
	9
	10	result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1, 0);
52cab8a0 JS	11
	12	if (!result)
	13	return 1;
	14
9585e406	15	while (result) {
52cab8a0	16	printf("%s\n", sha1_to_hex(result->item->object.sha1));
9585e406 JH	17	if (!show_all)
9585e406 JH	18	return 0;
52cab8a0	19	result = result->next;
9585e406	20	}
52cab8a0	21
9585e406	22	return 0;
6683463e LT	23	}
6683463e LT	24
e5d1a4df	25	static const char * const merge_base_usage[] = {
aa8f98c1	26	"git merge-base [-a\|--all] [--octopus] <commit> <commit>...",
a1e0ad78	27	"git merge-base --independent <commit>...",
e5d1a4df PH	28	NULL
e5d1a4df PH	29	};
9585e406	30
df57accb CC	31	static struct commit get_commit_reference(const char arg)
	32	{
	33	unsigned char revkey[20];
	34	struct commit *r;
	35
	36	if (get_sha1(arg, revkey))
	37	die("Not a valid object name %s", arg);
	38	r = lookup_commit_reference(revkey);
	39	if (!r)
	40	die("Not a valid commit name %s", arg);
	41
	42	return r;
	43	}
	44
a1e0ad78	45	static int handle_octopus(int count, const char **args, int reduce, int show_all)
aa8f98c1 JN	46	{
	47	struct commit_list *revs = NULL;
	48	struct commit_list *result;
	49	int i;
	50
a1e0ad78 JN	51	if (reduce)
	52	show_all = 1;
	53
	54	for (i = count - 1; i >= 0; i--)
aa8f98c1	55	commit_list_insert(get_commit_reference(args[i]), &revs);
a1e0ad78 JN	56
a1e0ad78 JN	57	result = reduce ? reduce_heads(revs) : get_octopus_merge_bases(revs);
aa8f98c1 JN	58
	59	if (!result)
	60	return 1;
	61
	62	while (result) {
	63	printf("%s\n", sha1_to_hex(result->item->object.sha1));
	64	if (!show_all)
	65	return 0;
	66	result = result->next;
	67	}
	68
	69	return 0;
	70	}
	71
71dfbf22	72	int cmd_merge_base(int argc, const char *argv, const char prefix)
6683463e	73	{
53eda89b CC	74	struct commit **rev;
53eda89b CC	75	int rev_nr = 0;
71dfbf22	76	int show_all = 0;
aa8f98c1	77	int octopus = 0;
a1e0ad78	78	int reduce = 0;
6683463e	79
e5d1a4df	80	struct option options[] = {
aa8f98c1 JN	81	OPT_BOOLEAN('a', "all", &show_all, "output all common ancestors"),
aa8f98c1 JN	82	OPT_BOOLEAN(0, "octopus", &octopus, "find ancestors for a single n-way merge"),
a1e0ad78	83	OPT_BOOLEAN(0, "independent", &reduce, "list revs not reachable from others"),
e5d1a4df PH	84	OPT_END()
e5d1a4df PH	85	};
53eda89b	86
e5d1a4df	87	git_config(git_default_config, NULL);
37782920	88	argc = parse_options(argc, argv, prefix, options, merge_base_usage, 0);
a1e0ad78	89	if (!octopus && !reduce && argc < 2)
e5d1a4df	90	usage_with_options(merge_base_usage, options);
a1e0ad78 JN	91	if (reduce && (show_all \|\| octopus))
a1e0ad78 JN	92	die("--independent cannot be used with other options");
aa8f98c1	93
a1e0ad78 JN	94	if (octopus \|\| reduce)
a1e0ad78 JN	95	return handle_octopus(argc, argv, reduce, show_all);
aa8f98c1	96
e5d1a4df PH	97	rev = xmalloc(argc * sizeof(*rev));
	98	while (argc-- > 0)
	99	rev[rev_nr++] = get_commit_reference(*argv++);
53eda89b	100	return show_merge_base(rev, rev_nr, show_all);
6683463e	101	}