diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-07-08 18:42:41 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-13 23:10:19 -0700 |
| commit | 6d297f81373e19d86b8f02cb68120201d1b0ab1d (patch) | |
| tree | f036ee3b98ce1a260895d8d3bec4889189dabafe /git-merge.sh | |
| parent | 4b7ce6e2d6ba088da50de1df38b040ea2c0b8f18 (diff) | |
| download | git-6d297f81373e19d86b8f02cb68120201d1b0ab1d.tar.gz git-6d297f81373e19d86b8f02cb68120201d1b0ab1d.tar.xz | |
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>
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-merge.sh b/git-merge.sh index 24e3b507e..b26ca147c 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -9,15 +9,15 @@ USAGE='[-n] [--no-commit] [--squash] [-s <strategy>]... <merge-message> <head> < LF=' ' -all_strategies='recursive octopus resolve stupid ours' -default_twohead_strategies='recursive' +all_strategies='recur recur octopus resolve stupid ours' +default_twohead_strategies='recur' default_octopus_strategies='octopus' no_trivial_merge_strategies='ours' use_strategies= index_merge=t if test "@@NO_PYTHON@@"; then - all_strategies='resolve octopus stupid ours' + all_strategies='recur resolve octopus stupid ours' default_twohead_strategies='resolve' fi |