Make merge-base a built-in.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Jan 9, 2007 at 00:50 UTC
71dfbf224ff980f4085f75868dc409118418731e
4 files changed
+8
-8
Makefile
+1
-1
@@ -194,7 +194,6 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
194
PROGRAMS = \
195
git-convert-objects$X git-fetch-pack$X git-fsck-objects$X \
196
git-hash-object$X git-index-pack$X git-local-fetch$X \
197
- git-merge-base$X \
197
git-daemon$X \
198
git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \
199
git-peek-remote$X git-receive-pack$X \
@@ -289,6 +288,7 @@ BUILTIN_OBJS = \
288
builtin-ls-tree.o \
289
builtin-mailinfo.o \
290
builtin-mailsplit.o \
291
+ builtin-merge-base.o \
292
builtin-merge-file.o \
293
builtin-mv.o \
294
builtin-name-rev.o \
builtin-merge-base.c
renamed
+5
-7
@@ -1,9 +1,7 @@
1
#include "cache.h"
2
#include "commit.h"
3
4
-static int show_all;
5
-
6
-static int merge_base(struct commit *rev1, struct commit *rev2)
4
+static int show_merge_base(struct commit *rev1, struct commit *rev2, int show_all)
5
{
6
struct commit_list *result = get_merge_bases(rev1, rev2, 0);
7
@@ -23,16 +21,16 @@ static int merge_base(struct commit *rev1, struct commit *rev2)
21
static const char merge_base_usage[] =
22
"git-merge-base [--all] <commit-id> <commit-id>";
23
26
-int main(int argc, char **argv)
24
+int cmd_merge_base(int argc, const char **argv, const char *prefix)
25
{
26
struct commit *rev1, *rev2;
27
unsigned char rev1key[20], rev2key[20];
28
+ int show_all = 0;
29
31
- setup_git_directory();
30
git_config(git_default_config);
31
32
while (1 < argc && argv[1][0] == '-') {
35
- char *arg = argv[1];
33
+ const char *arg = argv[1];
34
if (!strcmp(arg, "-a") || !strcmp(arg, "--all"))
35
show_all = 1;
36
else
@@ -49,5 +47,5 @@ int main(int argc, char **argv)
47
rev2 = lookup_commit_reference(rev2key);
48
if (!rev1 || !rev2)
49
return 1;
52
- return merge_base(rev1, rev2);
50
+ return show_merge_base(rev1, rev2, show_all);
51
}
builtin.h
+1
@@ -42,6 +42,7 @@ extern int cmd_ls_files(int argc, const char **argv, const char *prefix);
42
extern int cmd_ls_tree(int argc, const char **argv, const char *prefix);
43
extern int cmd_mailinfo(int argc, const char **argv, const char *prefix);
44
extern int cmd_mailsplit(int argc, const char **argv, const char *prefix);
45
+extern int cmd_merge_base(int argc, const char **argv, const char *prefix);
46
extern int cmd_merge_file(int argc, const char **argv, const char *prefix);
47
extern int cmd_mv(int argc, const char **argv, const char *prefix);
48
extern int cmd_name_rev(int argc, const char **argv, const char *prefix);
git.c
+1
@@ -238,6 +238,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
238
{ "ls-tree", cmd_ls_tree, RUN_SETUP },
239
{ "mailinfo", cmd_mailinfo },
240
{ "mailsplit", cmd_mailsplit },
241
+ { "merge-base", cmd_merge_base, RUN_SETUP },
242
{ "merge-file", cmd_merge_file },
243
{ "mv", cmd_mv, RUN_SETUP },
244
{ "name-rev", cmd_name_rev, RUN_SETUP },