Browse Source

Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites.

They are already set and exoprted by sourcing ./test-lib.sh
in all test scripts.

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Kristian Høgsberg 18 years ago committed by Junio C Hamano
parent
commit
9e54dc6c12
  1. 4
      t/t3501-revert-cherry-pick.sh
  2. 8
      t/t3901-i18n-patch.sh

4
t/t3501-revert-cherry-pick.sh

@ -44,7 +44,7 @@ test_expect_success setup '
test_expect_success 'cherry-pick after renaming branch' ' test_expect_success 'cherry-pick after renaming branch' '


git checkout rename2 && git checkout rename2 &&
EDITOR=: VISUAL=: git cherry-pick added && git cherry-pick added &&
test -f opos && test -f opos &&
grep "Add extra line at the end" opos grep "Add extra line at the end" opos


@ -53,7 +53,7 @@ test_expect_success 'cherry-pick after renaming branch' '
test_expect_success 'revert after renaming branch' ' test_expect_success 'revert after renaming branch' '


git checkout rename1 && git checkout rename1 &&
EDITOR=: VISUAL=: git revert added && git revert added &&
test -f spoo && test -f spoo &&
! grep "Add extra line at the end" spoo ! grep "Add extra line at the end" spoo



8
t/t3901-i18n-patch.sh

@ -154,7 +154,7 @@ test_expect_success 'cherry-pick(U/U)' '
git reset --hard master && git reset --hard master &&
git cherry-pick side^ && git cherry-pick side^ &&
git cherry-pick side && git cherry-pick side &&
EDITOR=: VISUAL=: git revert HEAD && git revert HEAD &&


check_encoding 3 check_encoding 3
' '
@ -169,7 +169,7 @@ test_expect_success 'cherry-pick(L/L)' '
git reset --hard master && git reset --hard master &&
git cherry-pick side^ && git cherry-pick side^ &&
git cherry-pick side && git cherry-pick side &&
EDITOR=: VISUAL=: git revert HEAD && git revert HEAD &&


check_encoding 3 8859 check_encoding 3 8859
' '
@ -184,7 +184,7 @@ test_expect_success 'cherry-pick(U/L)' '
git reset --hard master && git reset --hard master &&
git cherry-pick side^ && git cherry-pick side^ &&
git cherry-pick side && git cherry-pick side &&
EDITOR=: VISUAL=: git revert HEAD && git revert HEAD &&


check_encoding 3 check_encoding 3
' '
@ -200,7 +200,7 @@ test_expect_success 'cherry-pick(L/U)' '
git reset --hard master && git reset --hard master &&
git cherry-pick side^ && git cherry-pick side^ &&
git cherry-pick side && git cherry-pick side &&
EDITOR=: VISUAL=: git revert HEAD && git revert HEAD &&


check_encoding 3 8859 check_encoding 3 8859
' '

Loading…
Cancel
Save