make "git merge-tree" a built-in
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Linus Torvalds committed
Jan 21, 2010 at 18:25 UTC
907a7cb51c6c44d25f4c734a46d5174363190a84
4 files changed
+4
-4
Makefile
+1
-1
@@ -391,7 +391,6 @@ PROGRAMS += git-hash-object$X
391
PROGRAMS += git-imap-send$X
392
PROGRAMS += git-index-pack$X
393
PROGRAMS += git-merge-index$X
394
-PROGRAMS += git-merge-tree$X
394
PROGRAMS += git-mktag$X
395
PROGRAMS += git-pack-redundant$X
396
PROGRAMS += git-patch-id$X
@@ -672,6 +671,7 @@ BUILTIN_OBJS += builtin-merge-base.o
671
BUILTIN_OBJS += builtin-merge-file.o
672
BUILTIN_OBJS += builtin-merge-ours.o
673
BUILTIN_OBJS += builtin-merge-recursive.o
674
+BUILTIN_OBJS += builtin-merge-tree.o
675
BUILTIN_OBJS += builtin-mktree.o
676
BUILTIN_OBJS += builtin-mv.o
677
BUILTIN_OBJS += builtin-name-rev.o
builtin-merge-tree.c
renamed
+1
-3
@@ -337,7 +337,7 @@ static void *get_tree_descriptor(struct tree_desc *desc, const char *rev)
337
return buf;
338
}
339
340
-int main(int argc, char **argv)
340
+int cmd_merge_tree(int argc, const char **argv, const char *prefix)
341
{
342
struct tree_desc t[3];
343
void *buf1, *buf2, *buf3;
@@ -347,8 +347,6 @@ int main(int argc, char **argv)
347
348
git_extract_argv0_path(argv[0]);
349
350
- setup_git_directory();
351
-
350
buf1 = get_tree_descriptor(t+0, argv[1]);
351
buf2 = get_tree_descriptor(t+1, argv[2]);
352
buf3 = get_tree_descriptor(t+2, argv[3]);
builtin.h
+1
@@ -70,6 +70,7 @@ extern int cmd_merge_base(int argc, const char **argv, const char *prefix);
70
extern int cmd_merge_ours(int argc, const char **argv, const char *prefix);
71
extern int cmd_merge_file(int argc, const char **argv, const char *prefix);
72
extern int cmd_merge_recursive(int argc, const char **argv, const char *prefix);
73
+extern int cmd_merge_tree(int argc, const char **argv, const char *prefix);
74
extern int cmd_mktree(int argc, const char **argv, const char *prefix);
75
extern int cmd_mv(int argc, const char **argv, const char *prefix);
76
extern int cmd_name_rev(int argc, const char **argv, const char *prefix);
git.c
+1
@@ -335,6 +335,7 @@ static void handle_internal_command(int argc, const char **argv)
335
{ "merge-recursive-ours", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
336
{ "merge-recursive-theirs", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
337
{ "merge-subtree", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
338
+ { "merge-tree", cmd_merge_tree, RUN_SETUP },
339
{ "mktree", cmd_mktree, RUN_SETUP },
340
{ "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE },
341
{ "name-rev", cmd_name_rev, RUN_SETUP },