@matheusbsbs / matheus-bagliano / commits / 06d30f4f3e
Fork 0

recur vs recursive: help testing without touching too many stuff.

During git-merge-recur development, you could set an environment variable GIT_USE_RECUR_FOR_RECURSIVE to use WIP recur in place of the recursive strategy. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Jul 9, 2006 at 00:42 UTC 06d30f4f3eea71bce4cf48db3ea384976b3983b7
4 files changed +36 -12
TEST
+11 -7
@@ -1,10 +1,14 @@
1 #!/bin/sh -x
2 +
3 cd t || exit
3 -./t3400-rebase.sh "$@" && \
4 -./t6020-merge-df.sh "$@" && \
5 -./t3401-rebase-partial.sh "$@" && \
6 -./t6021-merge-criss-cross.sh "$@" && \
7 -./t3402-rebase-merge.sh "$@" && \
8 -./t6022-merge-rename.sh "$@" && \
9 -./t6010-merge-base.sh "$@" && \
4 +GIT_USE_RECUR_FOR_RECURSIVE=LetsTryIt
5 +export GIT_USE_RECUR_FOR_RECURSIVE
6 +
7 +./t3400-rebase.sh "$@" &&
8 +./t6020-merge-df.sh "$@" &&
9 +./t3401-rebase-partial.sh "$@" &&
10 +./t6021-merge-criss-cross.sh "$@" &&
11 +./t3402-rebase-merge.sh "$@" &&
12 +./t6022-merge-rename.sh "$@" &&
13 +./t6010-merge-base.sh "$@" &&
14 :
git-merge.sh
+11 -2
@@ -9,8 +9,13 @@ USAGE='[-n] [--no-commit] [--squash] [-s <strategy>]... <merge-message> <head> <
9 LF='
10 '
11
12 -all_strategies='recur recur octopus resolve stupid ours'
13 -default_twohead_strategies='recur'
12 +all_strategies='recursive recur octopus resolve stupid ours'
13 +case "${GIT_USE_RECUR_FOR_RECURSIVE}" in
14 +'')
15 + default_twohead_strategies=recursive ;;
16 +?*)
17 + default_twohead_strategies=recur ;;
18 +esac
19 default_octopus_strategies='octopus'
20 no_trivial_merge_strategies='ours'
21 use_strategies=
@@ -110,6 +115,10 @@ do
115 strategy="$2"
116 shift ;;
117 esac
118 + case "$strategy,${GIT_USE_RECUR_FOR_RECURSIVE}" in
119 + recursive,?*)
120 + strategy=recur ;;
121 + esac
122 case " $all_strategies " in
123 *" $strategy "*)
124 use_strategies="$use_strategies$strategy " ;;
git-rebase.sh
+13 -2
@@ -35,7 +35,13 @@ If you would prefer to skip this patch, instead run \"git rebase --skip\".
35 To restore the original branch and stop rebasing run \"git rebase --abort\".
36 "
37 unset newbase
38 -strategy=recur
38 +case "${GIT_USE_RECUR_FOR_RECURSIVE}" in
39 +'')
40 + strategy=recursive ;;
41 +?*)
42 + strategy=recur ;;
43 +esac
44 +
45 do_merge=
46 dotest=$GIT_DIR/.dotest-merge
47 prec=4
@@ -198,6 +204,11 @@ do
204 shift
205 done
206
207 +case "$strategy,${GIT_USE_RECUR_FOR_RECURSIVE}" in
208 +recursive,?*)
209 + strategy=recur ;;
210 +esac
211 +
212 # Make sure we do not have .dotest
213 if test -z "$do_merge"
214 then
@@ -292,7 +303,7 @@ then
303 exit $?
304 fi
305
295 -if test "@@NO_PYTHON@@" && test "$strategy" = "recur"
306 +if test "@@NO_PYTHON@@" && test "$strategy" = "recursive"
307 then
308 die 'The recursive merge strategy currently relies on Python,
309 which this installation of git was not configured with. Please consider
t/t3402-rebase-merge.sh
+1 -1
@@ -51,7 +51,7 @@ test_expect_success setup '
51 '
52
53 test_expect_success 'reference merge' '
54 - git merge -s recur "reference merge" HEAD master
54 + git merge -s recursive "reference merge" HEAD master
55 '
56
57 test_expect_success rebase '