]>
git.ipfire.org Git - thirdparty/git.git/blob - builtin-merge-base.c
4 #include "parse-options.h"
6 static int show_merge_base(struct commit
**rev
, int rev_nr
, int show_all
)
8 struct commit_list
*result
;
10 result
= get_merge_bases_many(rev
[0], rev_nr
- 1, rev
+ 1, 0);
16 printf("%s\n", sha1_to_hex(result
->item
->object
.sha1
));
19 result
= result
->next
;
25 static const char * const merge_base_usage
[] = {
26 "git merge-base [-a|--all] <commit> <commit>...",
30 static struct commit
*get_commit_reference(const char *arg
)
32 unsigned char revkey
[20];
35 if (get_sha1(arg
, revkey
))
36 die("Not a valid object name %s", arg
);
37 r
= lookup_commit_reference(revkey
);
39 die("Not a valid commit name %s", arg
);
44 int cmd_merge_base(int argc
, const char **argv
, const char *prefix
)
50 struct option options
[] = {
51 OPT_BOOLEAN('a', "all", &show_all
, "outputs all common ancestors"),
55 git_config(git_default_config
, NULL
);
56 argc
= parse_options(argc
, argv
, prefix
, options
, merge_base_usage
, 0);
58 usage_with_options(merge_base_usage
, options
);
59 rev
= xmalloc(argc
* sizeof(*rev
));
61 rev
[rev_nr
++] = get_commit_reference(*argv
++);
62 return show_merge_base(rev
, rev_nr
, show_all
);