merge-base.c 1.37 KB
Newer Older
1
#include "builtin.h"
2
#include "cache.h"
3
#include "commit.h"
4
#include "parse-options.h"
5

6
static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
7
{
8 9 10
	struct commit_list *result;

	result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1, 0);
11 12 13 14

	if (!result)
		return 1;

15
	while (result) {
16
		printf("%s\n", sha1_to_hex(result->item->object.sha1));
17 18
		if (!show_all)
			return 0;
19
		result = result->next;
20
	}
21

22
	return 0;
23 24
}

25
static const char * const merge_base_usage[] = {
26
	"git merge-base [-a|--all] <commit> <commit>...",
27 28
	NULL
};
29

30 31 32 33 34 35 36 37 38 39 40 41 42 43
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;
}

Junio C Hamano's avatar
Junio C Hamano committed
44
int cmd_merge_base(int argc, const char **argv, const char *prefix)
45
{
46 47
	struct commit **rev;
	int rev_nr = 0;
Junio C Hamano's avatar
Junio C Hamano committed
48
	int show_all = 0;
49

50 51 52 53
	struct option options[] = {
		OPT_BOOLEAN('a', "all", &show_all, "outputs all common ancestors"),
		OPT_END()
	};
54

55
	git_config(git_default_config, NULL);
56
	argc = parse_options(argc, argv, prefix, options, merge_base_usage, 0);
57 58 59 60 61
	if (argc < 2)
		usage_with_options(merge_base_usage, options);
	rev = xmalloc(argc * sizeof(*rev));
	while (argc-- > 0)
		rev[rev_nr++] = get_commit_reference(*argv++);
62
	return show_merge_base(rev, rev_nr, show_all);
63
}