From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Oct 2011 19:36:20 +0000 (-0700)
Subject: Merge branch 'jc/fetch-verify'
X-Git-Tag: v1.7.8-rc0~138
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2e2e7e9dd07107af8ce96428929775f267fdf98a;p=git.git

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()
---

2e2e7e9dd07107af8ce96428929775f267fdf98a
diff --cc t/t5504-fetch-receive-strict.sh
index 66100124a,000000000..8341fc4d1
mode 100755,000000..100755
--- a/t/t5504-fetch-receive-strict.sh
+++ b/t/t5504-fetch-receive-strict.sh
@@@ -1,104 -1,0 +1,104 @@@
 +#!/bin/sh
 +
 +test_description='fetch/receive strict mode'
 +. ./test-lib.sh
 +
 +test_expect_success setup '
 +	echo hello >greetings &&
 +	git add greetings &&
 +	git commit -m greetings &&
 +
 +	S=$(git rev-parse :greetings | sed -e "s|^..|&/|") &&
 +	X=$(echo bye | git hash-object -w --stdin | sed -e "s|^..|&/|") &&
 +	mv -f .git/objects/$X .git/objects/$S &&
 +
 +	test_must_fail git fsck
 +'
 +
 +test_expect_success 'fetch without strict' '
 +	rm -rf dst &&
 +	git init dst &&
 +	(
 +		cd dst &&
 +		git config fetch.fsckobjects false &&
 +		git config transfer.fsckobjects false &&
- 		git fetch ../.git master
++		test_must_fail git fetch ../.git master
 +	)
 +'
 +
 +test_expect_success 'fetch with !fetch.fsckobjects' '
 +	rm -rf dst &&
 +	git init dst &&
 +	(
 +		cd dst &&
 +		git config fetch.fsckobjects false &&
 +		git config transfer.fsckobjects true &&
- 		git fetch ../.git master
++		test_must_fail git fetch ../.git master
 +	)
 +'
 +
 +test_expect_success 'fetch with fetch.fsckobjects' '
 +	rm -rf dst &&
 +	git init dst &&
 +	(
 +		cd dst &&
 +		git config fetch.fsckobjects true &&
 +		git config transfer.fsckobjects false &&
 +		test_must_fail git fetch ../.git master
 +	)
 +'
 +
 +test_expect_success 'fetch with transfer.fsckobjects' '
 +	rm -rf dst &&
 +	git init dst &&
 +	(
 +		cd dst &&
 +		git config transfer.fsckobjects true &&
 +		test_must_fail git fetch ../.git master
 +	)
 +'
 +
 +test_expect_success 'push without strict' '
 +	rm -rf dst &&
 +	git init dst &&
 +	(
 +		cd dst &&
 +		git config fetch.fsckobjects false &&
 +		git config transfer.fsckobjects false
 +	) &&
 +	git push dst master:refs/heads/test
 +'
 +
 +test_expect_success 'push with !receive.fsckobjects' '
 +	rm -rf dst &&
 +	git init dst &&
 +	(
 +		cd dst &&
 +		git config receive.fsckobjects false &&
 +		git config transfer.fsckobjects true
 +	) &&
 +	git push dst master:refs/heads/test
 +'
 +
 +test_expect_success 'push with receive.fsckobjects' '
 +	rm -rf dst &&
 +	git init dst &&
 +	(
 +		cd dst &&
 +		git config receive.fsckobjects true &&
 +		git config transfer.fsckobjects false
 +	) &&
 +	test_must_fail git push dst master:refs/heads/test
 +'
 +
 +test_expect_success 'push with transfer.fsckobjects' '
 +	rm -rf dst &&
 +	git init dst &&
 +	(
 +		cd dst &&
 +		git config transfer.fsckobjects true
 +	) &&
 +	test_must_fail git push dst master:refs/heads/test
 +'
 +
 +test_done