[PATCH] t3404: make test 57 work with dash and others
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Jul 4, 2012, 11:32 UTC
- Message-ID
- <40eccb55835575b4a73131d1dced857ba7d4ecc3.1341401445.git.git@drmicha.warpmail.net>
The construct
VAR=value test_must_fail command args
works only for some shells (such as bash) but not others (such as dash) because VAR=value does not end up in the environment for command when it is called by the shell function test_must_fail. That is why we write
( VAR=value && export VAR && test_must_fail command args)
in most places already, bar the newly introduced 57 from b64b7fe (Add tests for rebase -i --root without --onto, 2012-06-26).
Make test 57 use that construct also.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> --- t/t3404-rebase-interactive.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 6ffc9c2..2f060ec 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -777,7 +777,9 @@ test_expect_success 'rebase -i --root retain root commit author and message' ' test_expect_success 'rebase -i --root temporary sentinel commit' ' git checkout B && - FAKE_LINES="2" test_must_fail git rebase -i --root && + ( FAKE_LINES="2" && + export FAKE_LINES && + test_must_fail git rebase -i --root ) && git cat-file commit HEAD | grep "^tree 4b825dc642cb" && git rebase --abort '
-- 1.7.11.1.214.g6a2db03