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>

1 files changed, 10 insertions, 0 deletions

diff --git a/TEST b/TEST
new file mode 100755
index 0000000000..d530983474
--- /dev/null
+++ b/TEST
@@ -0,0 +1,10 @@
+#!/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          "$@" && \
+: