From 71dfbf224ff980f4085f75868dc409118418731e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 9 Jan 2007 00:50:02 -0800 Subject: Make merge-base a built-in. Signed-off-by: Junio C Hamano --- merge-base.c | 53 ----------------------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 merge-base.c (limited to 'merge-base.c') diff --git a/merge-base.c b/merge-base.c deleted file mode 100644 index 385f4ba386..0000000000 --- a/merge-base.c +++ /dev/null @@ -1,53 +0,0 @@ -#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] "; - -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); -} -- cgit v1.2.3