kernel/git - git - PowerEL Git System

Tree: edf563fbaa

Author	SHA1	Message	Date
Miklos Vajna	696ee23cc1	merge-recursive: move current_{file,directory}_set to struct merge_options Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>	16 years ago
Miklos Vajna	c7d849243a	merge-recursive: move the global obuf to struct merge_options Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>	16 years ago
Miklos Vajna	5033639c95	merge-recursive: move call_depth to struct merge_options Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>	16 years ago
Miklos Vajna	8a2fce1895	merge-recursive: introduce merge_options This makes it possible to avoid passing the labels of branches as arguments to merge_recursive(), merge_trees() and merge_recursive_generic(). It also takes care of subtree merge, output buffering, verbosity, and rename limits - these were global variables till now in merge-recursive.c. A new function, named init_merge_options(), is introduced as well, it clears the struct merge_info, then initializes with default values, finally updates the default values based on the config and environment variables. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>	16 years ago
Stephan Beyer	73118f89b8	merge-recursive.c: Add more generic merge_recursive_generic() merge_recursive_generic() takes, in comparison to to merge_recursive(), no commit ("struct commit ") arguments but SHA ids ("unsigned char "), and no commit list of bases but an array of refs ("const char **"). This makes it more generic in the case that it can also take the SHA of a tree to merge trees without commits, for the bases, the head and the remote. merge_recursive_generic() also handles locking and updating of the index, which is a common use case of merge_recursive(). This patch also rewrites builtin-merge-recursive.c to make use of merge_recursive_generic(). By doing this, I stumbled over the limitation of 20 bases and I've added a warning if this limitation is exceeded. This patch qualifies make_virtual_commit() as static again because this function is not needed anymore outside merge-recursive.c. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	16 years ago
Miklos Vajna	9047ebbc22	Split out merge_recursive() to merge-recursive.c 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>	16 years ago
Daniel Barkalow	e1b3a2cad7	Build-in merge-recursive This makes write_tree_from_memory(), which writes the active cache as a tree and returns the struct tree for it, available to other code. It also makes available merge_trees(), which does the internal merge of two trees with a known base, and merge_recursive(), which does the recursive internal merge of two commits with a list of common ancestors. The first two of these will be used by checkout -m, and the third is presumably useful in general, although the implementation of checkout -m which entirely matches the behavior of the shell version does not use it (since it ignores the difference of ancestry between the old branch and the new branch). Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>	17 years ago