mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 15:04:49 +01:00
Code Activity
git/TEST

11 lines
315 B
Text
Raw Normal View History

Status update on merge-recursive in C 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>
2006-07-08 18:42:41 +02:00
#!/bin/sh -x
cd t || exit
./t3400-rebase.sh "$@" && \
./t6020-merge-df.sh "$@" && \
./t3401-rebase-partial.sh "$@" && \
./t6021-merge-criss-cross.sh "$@" && \
./t3402-rebase-merge.sh "$@" && \
./t6022-merge-rename.sh "$@" && \
./t6010-merge-base.sh "$@" && \
:
Copy permalink