Merge branch 'tb/test-t9020-no-which'
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Jan 2013 21:23:00 +0000 (13:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Jan 2013 21:23:01 +0000 (13:23 -0800)
* tb/test-t9020-no-which:
t9020: which is not portable

1  2 
t/t9020-remote-svn.sh
diff --combined t/t9020-remote-svn.sh
index d7be66a1d66006b099ff98225efb3ed1849f7b30,dbaecbc0329de3d3f71b553f65f6db946b7cb94f..2d2f016f6f8b151f10b08e4419dc6d3bdef3d0a8
@@@ -12,13 -12,9 +12,13 @@@ the
        test_done
  fi
  
 -# We override svnrdump by placing a symlink to the svnrdump-emulator in .
 -export PATH="$HOME:$PATH"
 -ln -sf $GIT_BUILD_DIR/contrib/svn-fe/svnrdump_sim.py "$HOME/svnrdump"
 +# Override svnrdump with our simulator
 +PATH="$HOME:$PATH"
 +export PATH PYTHON_PATH GIT_BUILD_DIR
 +
 +write_script "$HOME/svnrdump" <<\EOF
 +exec "$PYTHON_PATH" "$GIT_BUILD_DIR/contrib/svn-fe/svnrdump_sim.py" "$@"
 +EOF
  
  init_git () {
        rm -fr .git &&
@@@ -36,8 -32,8 +36,8 @@@ f
  
  test_debug '
        git --version
-       which git
-       which svnrdump
+       type git
+       type svnrdump
  '
  
  test_expect_success REMOTE_SVN 'simple fetch' '