string_list: Fix argument order for string_list_lookup

diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
index b70e177ddd75ca19c3be2698cb1a998b1bf85759..7b7d07269ae35f56dd02a223f350ae0da97bae85 100755 (executable)
--- a/t/t3402-rebase-merge.sh
+++ b/t/t3402-rebase-merge.sh
@@ -7,12 +7,6 @@ test_description='git rebase --merge test'
 
 . ./test-lib.sh
 
-if test "$no_python"; then
-       echo "Skipping: no python => no recursive merge"
-       test_done
-       exit 0
-fi
-
 T="A quick brown fox
 jumps over the lazy dog."
 for i in 1 2 3 4 5 6 7 8 9 10
@@ -51,12 +45,17 @@ test_expect_success setup '
 '
 
 test_expect_success 'reference merge' '
-       git merge -s recur "reference merge" HEAD master
+       git merge -s recursive "reference merge" HEAD master
 '
 
+PRE_REBASE=$(git rev-parse test-rebase)
 test_expect_success rebase '
        git checkout test-rebase &&
-       git rebase --merge master
+       GIT_TRACE=1 git rebase --merge master
+'
+
+test_expect_success 'test-rebase@{1} is pre rebase' '
+       test $PRE_REBASE = $(git rev-parse test-rebase@{1})
 '
 
 test_expect_success 'merge and rebase should match' '