summaryrefslogtreecommitdiff
path: root/t/t3409-rebase-hook.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-01-26 21:13:00 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-26 21:33:51 -0800
commit2d6061537f3f27112f80a6e1047b5c566084ef7d (patch)
tree4b8ea5541a793067a8de49721c53a155feed726a /t/t3409-rebase-hook.sh
parentrebase -i: correctly remember --root flag across --continue (diff)
downloadtgif-2d6061537f3f27112f80a6e1047b5c566084ef7d.tar.xz
tests: Avoid single-shot environment export for shell function invocation
Some shells have issues with a single-shot environment variable export when invoking a shell function. This fixes the ones I found that invoke test_must_fail that way. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3409-rebase-hook.sh')
-rwxr-xr-xt/t3409-rebase-hook.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/t/t3409-rebase-hook.sh b/t/t3409-rebase-hook.sh
index 1f1b850677..098b75507b 100755
--- a/t/t3409-rebase-hook.sh
+++ b/t/t3409-rebase-hook.sh
@@ -118,7 +118,11 @@ test_expect_success 'pre-rebase hook stops rebase (1)' '
test_expect_success 'pre-rebase hook stops rebase (2)' '
git checkout test &&
git reset --hard side &&
- EDITOR=true test_must_fail git rebase -i master &&
+ (
+ EDITOR=:
+ export EDITOR
+ test_must_fail git rebase -i master
+ ) &&
test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
test 0 = $(git rev-list HEAD...side | wc -l)
'