diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2012-07-04 13:32:04 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-07-05 15:33:25 -0700 |
| commit | 994fd91d1fd5e9feffc88ab7db19e9c9461b4543 (patch) | |
| tree | 73fb781ddc196fd606eaf4f67094aa00ab7853c2 | |
| parent | Add tests for rebase -i --root without --onto (diff) | |
| download | tgif-994fd91d1fd5e9feffc88ab7db19e9c9461b4543.tar.xz | |
t3404: make test 57 work with dash and others
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 explicitly
set and export variable in a subshell, i.e.
(
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 6ffc9c20c6..060f9d87d2 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -777,7 +777,11 @@ 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 ' |