summaryrefslogtreecommitdiff
path: root/t/t5504-fetch-receive-strict.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-05 12:36:20 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-05 12:36:20 -0700
commit2e2e7e9dd07107af8ce96428929775f267fdf98a (patch)
tree2ad475466a598a0004fa13cb0e5a5eb53fa559e2 /t/t5504-fetch-receive-strict.sh
parentca0c9764bfe4f5d33551b5cca74eb0966f796baf (diff)
parent6b67e0dc068d1bfd07686071b70f60078380666f (diff)
downloadgit-2e2e7e9dd07107af8ce96428929775f267fdf98a.tar.gz
Merge branch 'jc/fetch-verify'
* jc/fetch-verify: fetch: verify we have everything we need before updating our ref rev-list --verify-object list-objects: pass callback data to show_objects()
Diffstat (limited to 't/t5504-fetch-receive-strict.sh')
-rwxr-xr-xt/t5504-fetch-receive-strict.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh
index 66100124a9..8341fc4d15 100755
--- a/t/t5504-fetch-receive-strict.sh
+++ b/t/t5504-fetch-receive-strict.sh
@@ -22,7 +22,7 @@ test_expect_success 'fetch without strict' '
cd dst &&
git config fetch.fsckobjects false &&
git config transfer.fsckobjects false &&
- git fetch ../.git master
+ test_must_fail git fetch ../.git master
)
'
@@ -33,7 +33,7 @@ test_expect_success 'fetch with !fetch.fsckobjects' '
cd dst &&
git config fetch.fsckobjects false &&
git config transfer.fsckobjects true &&
- git fetch ../.git master
+ test_must_fail git fetch ../.git master
)
'