From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Jan 2013 22:10:36 +0000 (-0800)
Subject: Merge branch 'tb/test-t9020-no-which' into maint
X-Git-Tag: v1.8.1.1~30
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1493bcc775b9216524d98a332974b6e610120b34?ds=inline;hp=-c

Merge branch 'tb/test-t9020-no-which' into maint

* tb/test-t9020-no-which:
t9020: which is not portable
---

1493bcc775b9216524d98a332974b6e610120b34
diff --combined t/t9020-remote-svn.sh
index d7be66a1d6,dbaecbc032..2d2f016f6f
--- a/t/t9020-remote-svn.sh
+++ b/t/t9020-remote-svn.sh
@@@ -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' '