diff options
Diffstat (limited to 't/t5801-remote-helpers.sh')
| -rwxr-xr-x | t/t5801-remote-helpers.sh | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index a00a660763..25fd2e7f46 100755 --- a/t/t5801-remote-helpers.sh +++ b/t/t5801-remote-helpers.sh @@ -212,30 +212,19 @@ test_expect_success 'push update refs failure' ' echo "update fail" >>file && git commit -a -m "update fail" && git rev-parse --verify testgit/origin/heads/update >expect && - test_expect_code 1 env GIT_REMOTE_TESTGIT_FAILURE="non-fast forward" \ - git push origin update && + GIT_REMOTE_TESTGIT_PUSH_ERROR="non-fast forward" && + export GIT_REMOTE_TESTGIT_PUSH_ERROR && + test_expect_code 1 git push origin update && git rev-parse --verify testgit/origin/heads/update >actual && test_cmp expect actual ) ' -clean_mark () { - cut -f 2 -d ' ' "$1" | - git cat-file --batch-check | - grep commit | - sort >$(basename "$1") -} - -cmp_marks () { - test_when_finished "rm -rf git.marks testgit.marks" && - clean_mark ".git/testgit/$1/git.marks" && - clean_mark ".git/testgit/$1/testgit.marks" && - test_cmp git.marks testgit.marks -} - test_expect_success 'proper failure checks for fetching' ' - (cd local && - test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git fetch 2>error && + (GIT_REMOTE_TESTGIT_FAILURE=1 && + export GIT_REMOTE_TESTGIT_FAILURE && + cd local && + test_must_fail git fetch 2> error && cat error && grep -q "Error while running fast-import" error ) @@ -243,11 +232,7 @@ test_expect_success 'proper failure checks for fetching' ' test_expect_success 'proper failure checks for pushing' ' (cd local && - git checkout -b crash master && - echo crash >>file && - git commit -a -m crash && - test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git push --all && - cmp_marks origin + test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git push --all ) ' |