mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
a5031214c4
commit
907a7cb51c
2
Makefile
2
Makefile
|
@ -391,7 +391,6 @@ PROGRAMS += git-hash-object$X
|
|||
PROGRAMS += git-imap-send$X
|
||||
PROGRAMS += git-index-pack$X
|
||||
PROGRAMS += git-merge-index$X
|
||||
PROGRAMS += git-merge-tree$X
|
||||
PROGRAMS += git-mktag$X
|
||||
PROGRAMS += git-pack-redundant$X
|
||||
PROGRAMS += git-patch-id$X
|
||||
|
@ -672,6 +671,7 @@ BUILTIN_OBJS += builtin-merge-base.o
|
|||
BUILTIN_OBJS += builtin-merge-file.o
|
||||
BUILTIN_OBJS += builtin-merge-ours.o
|
||||
BUILTIN_OBJS += builtin-merge-recursive.o
|
||||
BUILTIN_OBJS += builtin-merge-tree.o
|
||||
BUILTIN_OBJS += builtin-mktree.o
|
||||
BUILTIN_OBJS += builtin-mv.o
|
||||
BUILTIN_OBJS += builtin-name-rev.o
|
||||
|
|
|
@ -337,7 +337,7 @@ static void *get_tree_descriptor(struct tree_desc *desc, const char *rev)
|
|||
return buf;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
int cmd_merge_tree(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
struct tree_desc t[3];
|
||||
void *buf1, *buf2, *buf3;
|
||||
|
@ -347,8 +347,6 @@ int main(int argc, char **argv)
|
|||
|
||||
git_extract_argv0_path(argv[0]);
|
||||
|
||||
setup_git_directory();
|
||||
|
||||
buf1 = get_tree_descriptor(t+0, argv[1]);
|
||||
buf2 = get_tree_descriptor(t+1, argv[2]);
|
||||
buf3 = get_tree_descriptor(t+2, argv[3]);
|
|
@ -70,6 +70,7 @@ extern int cmd_merge_base(int argc, const char **argv, const char *prefix);
|
|||
extern int cmd_merge_ours(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_merge_file(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_merge_recursive(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_merge_tree(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_mktree(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_mv(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_name_rev(int argc, const char **argv, const char *prefix);
|
||||
|
|
1
git.c
1
git.c
|
@ -335,6 +335,7 @@ static void handle_internal_command(int argc, const char **argv)
|
|||
{ "merge-recursive-ours", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
|
||||
{ "merge-recursive-theirs", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
|
||||
{ "merge-subtree", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
|
||||
{ "merge-tree", cmd_merge_tree, RUN_SETUP },
|
||||
{ "mktree", cmd_mktree, RUN_SETUP },
|
||||
{ "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE },
|
||||
{ "name-rev", cmd_name_rev, RUN_SETUP },
|
||||
|
|
Loading…
Reference in a new issue