Merge branch 'sg/t3020-typofix' into maint

diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 2c5bfc17cc0237e6048c4684ea7812a032edb9db..90519823be381390b7f89a1eb2f6007f1e8c86f4 100755 (executable)
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -94,6 +94,10 @@ test_expect_success 'add sub3' '
 # Back to mainline
 cd ..
 
+test_expect_success 'enable log.date=relative to catch errors' '
+       git config log.date relative
+'
+
 test_expect_success 'add main4' '
        create main4 &&
        git commit -m "main4" &&
@@ -177,7 +181,8 @@ test_expect_success 'check if --message for merge works with squash too' '
 test_expect_success 'merge new subproj history into subdir' '
        git subtree merge --prefix=subdir FETCH_HEAD &&
        git branch pre-split &&
-       check_equal ''"$(last_commit_message)"'' "Merge commit '"'"'"$(git rev-parse sub2)"'"'"' into mainline"
+       check_equal ''"$(last_commit_message)"'' "Merge commit '"'"'"$(git rev-parse sub2)"'"'"' into mainline" &&
+       undo
 '
 
 test_expect_success 'Check that prefix argument is required for split' '
@@ -218,12 +223,9 @@ test_expect_success 'check split with --branch' '
 
 test_expect_success 'check hash of split' '
        spl1=$(git subtree split --prefix subdir) &&
-       undo &&
        git subtree split --prefix subdir --branch splitbr1test &&
-       check_equal ''"$(git rev-parse splitbr1test)"'' "$spl1"
-       git checkout splitbr1test &&
-       new_hash=$(git rev-parse HEAD~2) &&
-       git checkout mainline &&
+       check_equal ''"$(git rev-parse splitbr1test)"'' "$spl1" &&
+       new_hash=$(git rev-parse splitbr1test~2) &&
        check_equal ''"$new_hash"'' "$subdir_hash"
 '
 
@@ -269,7 +271,7 @@ test_expect_success 'add sub9' '
 cd ..
 
 test_expect_success 'split for sub8' '
-       split2=''"$(git subtree split --annotate='"'*'"' --prefix subdir/ --rejoin)"''
+       split2=''"$(git subtree split --annotate='"'*'"' --prefix subdir/ --rejoin)"'' &&
        git branch split2 "$split2"
 '