rebase: implement --[no-]autostash and rebase.autostash

diff --git a/t/t9020-remote-svn.sh b/t/t9020-remote-svn.sh
index d7be66a1d66006b099ff98225efb3ed1849f7b30..d9f6b73ab001c4105cf336e213978807d8acf864 100755 (executable)
--- a/t/t9020-remote-svn.sh
+++ b/t/t9020-remote-svn.sh
@@ -36,8 +36,8 @@ fi
 
 test_debug '
        git --version
-       which git
-       which svnrdump
+       type git
+       type svnrdump
 '
 
 test_expect_success REMOTE_SVN 'simple fetch' '
@@ -74,7 +74,8 @@ test_expect_success REMOTE_SVN 'mark-file regeneration' '
 '
 
 test_expect_success REMOTE_SVN 'incremental imports must lead to the same head' '
-       export SVNRMAX=3 &&
+       SVNRMAX=3 &&
+       export SVNRMAX &&
        init_git &&
        git fetch svnsim &&
        test_cmp .git/refs/svn/svnsim/master .git/refs/remotes/svnsim/master  &&