merge-base.c 2.33 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] [--octopus] <commit> <commit>...",
27
	"git merge-base --independent <commit>...",
28 29
	NULL
};
30

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

45
static int handle_octopus(int count, const char **args, int reduce, int show_all)
46 47 48 49 50
{
	struct commit_list *revs = NULL;
	struct commit_list *result;
	int i;

51 52 53 54
	if (reduce)
		show_all = 1;

	for (i = count - 1; i >= 0; i--)
55
		commit_list_insert(get_commit_reference(args[i]), &revs);
56 57

	result = reduce ? reduce_heads(revs) : get_octopus_merge_bases(revs);
58 59 60 61 62 63 64 65 66 67 68 69 70 71

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

Junio C Hamano's avatar
Junio C Hamano committed
72
int cmd_merge_base(int argc, const char **argv, const char *prefix)
73
{
74 75
	struct commit **rev;
	int rev_nr = 0;
Junio C Hamano's avatar
Junio C Hamano committed
76
	int show_all = 0;
77
	int octopus = 0;
78
	int reduce = 0;
79

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

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

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

97 98 99
	rev = xmalloc(argc * sizeof(*rev));
	while (argc-- > 0)
		rev[rev_nr++] = get_commit_reference(*argv++);
100
	return show_merge_base(rev, rev_nr, show_all);
101
}