]>
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) |
18 | return 0; | |
52cab8a0 | 19 | result = result->next; |
9585e406 | 20 | } |
52cab8a0 | 21 | |
9585e406 | 22 | return 0; |
6683463e LT |
23 | } |
24 | ||
e5d1a4df PH |
25 | static const char * const merge_base_usage[] = { |
26 | "git merge-base [--all] <commit-id> <commit-id>...", | |
27 | NULL | |
28 | }; | |
9585e406 | 29 | |
df57accb CC |
30 | static struct commit *get_commit_reference(const char *arg) |
31 | { | |
32 | unsigned char revkey[20]; | |
33 | struct commit *r; | |
34 | ||
35 | if (get_sha1(arg, revkey)) | |
36 | die("Not a valid object name %s", arg); | |
37 | r = lookup_commit_reference(revkey); | |
38 | if (!r) | |
39 | die("Not a valid commit name %s", arg); | |
40 | ||
41 | return r; | |
42 | } | |
43 | ||
71dfbf22 | 44 | int cmd_merge_base(int argc, const char **argv, const char *prefix) |
6683463e | 45 | { |
53eda89b CC |
46 | struct commit **rev; |
47 | int rev_nr = 0; | |
71dfbf22 | 48 | int show_all = 0; |
6683463e | 49 | |
e5d1a4df PH |
50 | struct option options[] = { |
51 | OPT_BOOLEAN('a', "all", &show_all, "outputs all common ancestors"), | |
52 | OPT_END() | |
53 | }; | |
53eda89b | 54 | |
e5d1a4df PH |
55 | git_config(git_default_config, NULL); |
56 | argc = parse_options(argc, argv, options, merge_base_usage, 0); | |
57 | if (argc < 2) | |
58 | usage_with_options(merge_base_usage, options); | |
59 | rev = xmalloc(argc * sizeof(*rev)); | |
60 | while (argc-- > 0) | |
61 | rev[rev_nr++] = get_commit_reference(*argv++); | |
53eda89b | 62 | return show_merge_base(rev, rev_nr, show_all); |
6683463e | 63 | } |