summaryrefslogtreecommitdiff
path: root/builtin-merge-base.c
diff options
context:
space:
mode:
Diffstat (limited to 'builtin-merge-base.c')
-rw-r--r--builtin-merge-base.c60
1 files changed, 0 insertions, 60 deletions
diff --git a/builtin-merge-base.c b/builtin-merge-base.c
deleted file mode 100644
index 3382b1382a..0000000000
--- a/builtin-merge-base.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include "builtin.h"
-#include "cache.h"
-#include "commit.h"
-
-static int show_merge_base(struct commit *rev1, struct commit *rev2, int show_all)
-{
- 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>";
-
-static struct commit *get_commit_reference(const char *arg)
-{
- unsigned char revkey[20];
- struct commit *r;
-
- if (get_sha1(arg, revkey))
- die("Not a valid object name %s", arg);
- r = lookup_commit_reference(revkey);
- if (!r)
- die("Not a valid commit name %s", arg);
-
- return r;
-}
-
-int cmd_merge_base(int argc, const char **argv, const char *prefix)
-{
- struct commit *rev1, *rev2;
- int show_all = 0;
-
- git_config(git_default_config, NULL);
-
- while (1 < argc && argv[1][0] == '-') {
- const 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);
- rev1 = get_commit_reference(argv[1]);
- rev2 = get_commit_reference(argv[2]);
-
- return show_merge_base(rev1, rev2, show_all);
-}