]>
Commit | Line | Data |
---|---|---|
baffc0e7 | 1 | #include "builtin.h" |
6683463e | 2 | #include "cache.h" |
b5039db6 | 3 | #include "commit.h" |
6683463e | 4 | |
71dfbf22 | 5 | static int show_merge_base(struct commit *rev1, struct commit *rev2, int show_all) |
52cab8a0 | 6 | { |
c0fa8255 | 7 | struct commit_list *result = get_merge_bases(rev1, rev2, 0); |
52cab8a0 JS |
8 | |
9 | if (!result) | |
10 | return 1; | |
11 | ||
9585e406 | 12 | while (result) { |
52cab8a0 | 13 | printf("%s\n", sha1_to_hex(result->item->object.sha1)); |
9585e406 JH |
14 | if (!show_all) |
15 | return 0; | |
52cab8a0 | 16 | result = result->next; |
9585e406 | 17 | } |
52cab8a0 | 18 | |
9585e406 | 19 | return 0; |
6683463e LT |
20 | } |
21 | ||
9585e406 | 22 | static const char merge_base_usage[] = |
1b1dd23f | 23 | "git merge-base [--all] <commit-id> <commit-id>"; |
9585e406 | 24 | |
df57accb CC |
25 | static struct commit *get_commit_reference(const char *arg) |
26 | { | |
27 | unsigned char revkey[20]; | |
28 | struct commit *r; | |
29 | ||
30 | if (get_sha1(arg, revkey)) | |
31 | die("Not a valid object name %s", arg); | |
32 | r = lookup_commit_reference(revkey); | |
33 | if (!r) | |
34 | die("Not a valid commit name %s", arg); | |
35 | ||
36 | return r; | |
37 | } | |
38 | ||
71dfbf22 | 39 | int cmd_merge_base(int argc, const char **argv, const char *prefix) |
6683463e | 40 | { |
9585e406 | 41 | struct commit *rev1, *rev2; |
71dfbf22 | 42 | int show_all = 0; |
6683463e | 43 | |
ef90d6d4 | 44 | git_config(git_default_config, NULL); |
53228a5f | 45 | |
9585e406 | 46 | while (1 < argc && argv[1][0] == '-') { |
71dfbf22 | 47 | const char *arg = argv[1]; |
9585e406 JH |
48 | if (!strcmp(arg, "-a") || !strcmp(arg, "--all")) |
49 | show_all = 1; | |
50 | else | |
51 | usage(merge_base_usage); | |
52 | argc--; argv++; | |
53 | } | |
31fff305 | 54 | if (argc != 3) |
9585e406 | 55 | usage(merge_base_usage); |
df57accb CC |
56 | rev1 = get_commit_reference(argv[1]); |
57 | rev2 = get_commit_reference(argv[2]); | |
58 | ||
71dfbf22 | 59 | return show_merge_base(rev1, rev2, show_all); |
6683463e | 60 | } |