diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:20 -0700 |
| commit | 2e2e7e9dd07107af8ce96428929775f267fdf98a (patch) | |
| tree | 2ad475466a598a0004fa13cb0e5a5eb53fa559e2 /t | |
| parent | Merge branch 'jc/fetch-pack-fsck-objects' (diff) | |
| parent | fetch: verify we have everything we need before updating our ref (diff) | |
| download | tgif-2e2e7e9dd07107af8ce96428929775f267fdf98a.tar.xz | |
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')
| -rwxr-xr-x | t/t5504-fetch-receive-strict.sh | 4 |
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 ) ' |