From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Nov 2007 22:25:19 +0000 (-0800)
Subject: Merge branch 'bs/maint-t7005'
X-Git-Tag: v1.5.4-rc0~206
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9f165805f3bde8cd91653f2db1c35a4548b85625?hp=-c

Merge branch 'bs/maint-t7005'

* bs/maint-t7005:
t7005-editor.sh: Don't invoke real vi when it is in GIT_EXEC_PATH
---

9f165805f3bde8cd91653f2db1c35a4548b85625
diff --combined t/t7005-editor.sh
index 01cc0c02b1,ed416e14e0..44228b5ac1
--- a/t/t7005-editor.sh
+++ b/t/t7005-editor.sh
@@@ -4,8 -4,6 +4,8 @@@ test_description='GIT_EDITOR, core.edit
  
  . ./test-lib.sh
  
 +OLD_TERM="$TERM"
 +
  for i in GIT_EDITOR core_editor EDITOR VISUAL vi
  do
  	cat >e-$i.sh <<-EOF
@@@ -15,7 -13,6 +15,6 @@@
  done
  unset vi
  mv e-vi.sh vi
- PATH=".:$PATH"
  unset EDITOR VISUAL GIT_EDITOR
  
  test_expect_success setup '
@@@ -61,7 -58,7 +60,7 @@@ d
  		;;
  	esac
  	test_expect_success "Using $i" '
- 		git commit --amend &&
+ 		git --exec-path=. commit --amend &&
  		git show -s --pretty=oneline |
  		sed -e "s/^[0-9a-f]* //" >actual &&
  		diff actual expect
@@@ -83,13 -80,11 +82,13 @@@ d
  		;;
  	esac
  	test_expect_success "Using $i (override)" '
- 		git commit --amend &&
+ 		git --exec-path=. commit --amend &&
  		git show -s --pretty=oneline |
  		sed -e "s/^[0-9a-f]* //" >actual &&
  		diff actual expect
  	'
  done
  
 +TERM="$OLD_TERM"
 +
  test_done