From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 8 Aug 2009 03:44:02 +0000 (-0700)
Subject: Merge branch 'maint-1.6.0' into maint-1.6.1
X-Git-Tag: v1.6.4.4~2^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0d5055665ca1e76659ffa96bf972b4b0125ea069?ds=inline;hp=-c

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
verify-pack -v: do not report "chain length 0"
t5510: harden the way verify-pack is used
---

0d5055665ca1e76659ffa96bf972b4b0125ea069
diff --combined t/t5510-fetch.sh
index 9e679b402d,61a02a91a1..b2e6e96b3f
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@@ -9,6 -9,11 +9,11 @@@ test_description='Per branch config var
  
  D=`pwd`
  
+ test_bundle_object_count () {
+ 	git verify-pack -v "$1" >verify.out &&
+ 	test "$2" = $(grep '^[0-9a-f]\{40\} ' verify.out | wc -l)
+ }
+ 
  test_expect_success setup '
  	echo >file original &&
  	git add file &&
@@@ -146,6 -151,7 +151,7 @@@ test_expect_success 'unbundle 1' 
  	test_must_fail git fetch "$D/bundle1" master:master
  '
  
+ 
  test_expect_success 'bundle 1 has only 3 files ' '
  	cd "$D" &&
  	(
@@@ -156,8 -162,7 +162,7 @@@
  		cat
  	) <bundle1 >bundle.pack &&
  	git index-pack bundle.pack &&
- 	verify=$(git verify-pack -v bundle.pack) &&
- 	test 4 = $(echo "$verify" | wc -l)
+ 	test_bundle_object_count bundle.pack 3
  '
  
  test_expect_success 'unbundle 2' '
@@@ -180,7 -185,7 +185,7 @@@ test_expect_success 'bundle does not pr
  		cat
  	) <bundle3 >bundle.pack &&
  	git index-pack bundle.pack &&
- 	test 4 = $(git verify-pack -v bundle.pack | wc -l)
+ 	test_bundle_object_count bundle.pack 3
  '
  
  test_expect_success 'bundle should be able to create a full history' '
@@@ -303,26 -308,6 +308,26 @@@ test_expect_success 'pushing nonexisten
  
  '
  
 +test_expect_success 'auto tag following fetches minimum' '
 +
 +	cd "$D" &&
 +	git clone .git follow &&
 +	git checkout HEAD^0 &&
 +	(
 +		for i in 1 2 3 4 5 6 7
 +		do
 +			echo $i >>file &&
 +			git commit -m $i -a &&
 +			git tag -a -m $i excess-$i || exit 1
 +		done
 +	) &&
 +	git checkout master &&
 +	(
 +		cd follow &&
 +		git fetch
 +	)
 +'
 +
  test_expect_success 'refuse to fetch into the current branch' '
  
  	test_must_fail git fetch . side:master