development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 03:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split out merge_recursive() to merge-recursive.c

Browse source 
Move most of the of code from builtin-merge-recursive.c to a new file
merge-recursive.c and introduce merge_recursive_setup() in there so that
builtin-merge-recursive and other builtins call it.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Miklos Vajna 2008-08-12 18:45:14 +02:00 committed by Junio C Hamano
parent 7df437e56b
commit 9047ebbc22
4 changed files with 1341 additions and 1324 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -440,6 +440,7 @@ LIB_OBJS += log-tree.o
LIB_OBJS += mailmap.o
LIB_OBJS += match-trees.o
LIB_OBJS += merge-file.o
LIB_OBJS += merge-recursive.o
LIB_OBJS += name-hash.o
LIB_OBJS += object.o
LIB_OBJS += pack-check.o

1327
builtin-merge-recursive.c
View file

File diff suppressed because it is too large Load diff

1331
merge-recursive.c Normal file
View file

File diff suppressed because it is too large Load diff

6
merge-recursive.h
View file

@ -14,7 +14,11 @@ int merge_trees(struct tree *head,
const char *branch1,
const char *branch2,
struct tree **result);
struct commit *make_virtual_commit(struct tree *tree, const char *comment);
int merge_recursive_config(const char *var, const char *value, void *cb);
void merge_recursive_setup(int is_subtree_merge);
struct tree *write_tree_from_memory(void);
extern int merge_recursive_verbosity;
#endif