summaryrefslogtreecommitdiff
path: root/t/t5504-fetch-receive-strict.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-29 19:59:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-29 19:59:08 (GMT)
commitd689301043f6dc14d71e7d33e1b8ea600ae1b67b (patch)
treede02603666c3fee3c3c1f93b826c27d020d40f1c /t/t5504-fetch-receive-strict.sh
parent60b3e9b959f4423f6927ef77e7097bea3ad24e45 (diff)
parentc4b27511ab0e3ec464e3fd3d4711251a17b1f733 (diff)
downloadgit-d689301043f6dc14d71e7d33e1b8ea600ae1b67b.zip
git-d689301043f6dc14d71e7d33e1b8ea600ae1b67b.tar.gz
git-d689301043f6dc14d71e7d33e1b8ea600ae1b67b.tar.bz2
Merge branch 'jk/push-client-deadlock-fix'
"git push" from a corrupt repository that attempts to push a large number of refs deadlocked; the thread to relay rejection notices for these ref updates blocked on writing them to the main thread, after the main thread at the receiving end notices that the push failed and decides not to read these notices and return a failure. * jk/push-client-deadlock-fix: t5504: drop sigpipe=ok from push tests fetch-pack: isolate sigpipe in demuxer thread send-pack: isolate sigpipe in demuxer thread run-command: teach async threads to ignore SIGPIPE send-pack: close demux pipe before finishing async process
Diffstat (limited to 't/t5504-fetch-receive-strict.sh')
-rwxr-xr-xt/t5504-fetch-receive-strict.sh10
1 files changed, 4 insertions, 6 deletions
diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh
index a3e12d2..44f3d5f 100755
--- a/t/t5504-fetch-receive-strict.sh
+++ b/t/t5504-fetch-receive-strict.sh
@@ -100,11 +100,8 @@ test_expect_success 'push with receive.fsckobjects' '
git config receive.fsckobjects true &&
git config transfer.fsckobjects false
) &&
- test_must_fail ok=sigpipe git push --porcelain dst master:refs/heads/test >act &&
- {
- test_cmp exp act ||
- ! test -s act
- }
+ test_must_fail git push --porcelain dst master:refs/heads/test >act &&
+ test_cmp exp act
'
test_expect_success 'push with transfer.fsckobjects' '
@@ -114,7 +111,8 @@ test_expect_success 'push with transfer.fsckobjects' '
cd dst &&
git config transfer.fsckobjects true
) &&
- test_must_fail ok=sigpipe git push --porcelain dst master:refs/heads/test >act
+ test_must_fail git push --porcelain dst master:refs/heads/test >act &&
+ test_cmp exp act
'
cat >bogus-commit <<\EOF