mirror of
https://github.com/git/git.git
synced 2024-11-25 19:04:18 +08:00
96f1e58f52
[jc: I needed to hand merge the changes to the updated codebase, so the result needs to be checked.] Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
55 lines
1.2 KiB
C
55 lines
1.2 KiB
C
#include <stdlib.h>
|
|
#include "cache.h"
|
|
#include "commit.h"
|
|
|
|
static int show_all;
|
|
|
|
static int merge_base(struct commit *rev1, struct commit *rev2)
|
|
{
|
|
struct commit_list *result = get_merge_bases(rev1, rev2, 0);
|
|
|
|
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;
|
|
}
|
|
|
|
static const char merge_base_usage[] =
|
|
"git-merge-base [--all] <commit-id> <commit-id>";
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
struct commit *rev1, *rev2;
|
|
unsigned char rev1key[20], rev2key[20];
|
|
|
|
setup_git_directory();
|
|
git_config(git_default_config);
|
|
|
|
while (1 < argc && argv[1][0] == '-') {
|
|
char *arg = argv[1];
|
|
if (!strcmp(arg, "-a") || !strcmp(arg, "--all"))
|
|
show_all = 1;
|
|
else
|
|
usage(merge_base_usage);
|
|
argc--; argv++;
|
|
}
|
|
if (argc != 3)
|
|
usage(merge_base_usage);
|
|
if (get_sha1(argv[1], rev1key))
|
|
die("Not a valid object name %s", argv[1]);
|
|
if (get_sha1(argv[2], rev2key))
|
|
die("Not a valid object name %s", argv[2]);
|
|
rev1 = lookup_commit_reference(rev1key);
|
|
rev2 = lookup_commit_reference(rev2key);
|
|
if (!rev1 || !rev2)
|
|
return 1;
|
|
return merge_base(rev1, rev2);
|
|
}
|