delta/git.git - github.com: git/git.git

	Commit message (Collapse)	Author	Age	Files	Lines
...
*	merge-recur: Get rid of debug code	Johannes Schindelin	2006-07-27	1	-64/+1
\| \| \| \| \|	Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
*	merge-recur: Convert variable names to lower_case	Johannes Schindelin	2006-07-27	1	-191/+189
\| \| \| \| \|	Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
*	Cumulative update of merge-recursive in C	Johannes Schindelin	2006-07-27	1	-526/+364
\| \| \| \| \| \| \| \| \| \| \|	This contains mainly three sorts of fixes: - get rid of small wrapper functions - reuse the diff_filespec structure when sha1, mode & path are needed - Junio's pedantic updates Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
*	Merge branch 'lt/unitype' into js/c-merge-recursive	Junio C Hamano	2006-07-13	1	-1/+1
\| \| \| \| \| \|	* lt/unitype: builtin-prune.c: forgot TYPE => OBJ changes. Remove TYPE_* constant macros and use object_type enums consistently.
*	Status update on merge-recursive in C	Johannes Schindelin	2006-07-13	1	-0/+1560
	This is just an update for people being interested. Alex and me were busy with that project for a few days now. While it has progressed nicely, there are quite a couple TODOs in merge-recursive.c, just search for "TODO". For impatient people: yes, it passes all the tests, and yes, according to the evil test Alex did, it is faster than the Python script. But no, it is not yet finished. Biggest points are: - there are still three external calls - in the end, it should not be necessary to write the index more than once (just before exiting) - a lot of things can be refactored to make the code easier and shorter BTW we cannot just plug in git-merge-tree yet, because git-merge-tree does not handle renames at all. This patch is meant for testing, and as such, - it compile the program to git-merge-recur - it adjusts the scripts and tests to use git-merge-recur instead of git-merge-recursive - it provides "TEST", a script to execute the tests regarding -recursive - it inlines the changes to read-cache.c (read_cache_from(), discard_cache() and refresh_cache_entry()) Brought to you by Alex Riesen and Dscho Signed-off-by: Junio C Hamano <junkio@cox.net>