From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 29 Aug 2009 02:38:56 +0000 (-0700)
Subject: Merge branch 'np/maint-1.6.3-deepen'
X-Git-Tag: v1.6.5-rc0~25
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=232d4537667e32230c855777444abbe732536ed9;p=git.git

Merge branch 'np/maint-1.6.3-deepen'

* np/maint-1.6.3-deepen:
  fix simple deepening of a repo

Conflicts:
	t/t5500-fetch-pack.sh
---

232d4537667e32230c855777444abbe732536ed9
diff --cc t/t5500-fetch-pack.sh
index a8c2ca2a7,ea5a4ed3b..18376d660
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@@ -112,93 -127,101 +112,140 @@@ test_expect_success 'post 1st pull setu
  
  pull_to_client 2nd "B" $((64*3))
  
 -pull_to_client 3rd "A" $((1*3)) # old fails
 -
 -test_expect_success "clone shallow" 'git clone --depth 2 "file://$(pwd)/." shallow'
 +pull_to_client 3rd "A" $((1*3))
  
 -(cd shallow; git count-objects -v) > count.shallow
 -
 -test_expect_success "clone shallow object count" \
 -	"test \"in-pack: 18\" = \"$(grep in-pack count.shallow)\""
 +test_expect_success 'clone shallow' '
 +	git clone --depth 2 "file://$(pwd)/." shallow
 +'
  
 -count_output () {
 -	sed -e '/^in-pack:/d' -e '/^packs:/d' -e '/^size-pack:/d' -e '/: 0$/d' "$1"
 -}
 +test_expect_success 'clone shallow object count' '
 +	(
 +		cd shallow &&
 +		git count-objects -v
 +	) > count.shallow &&
 +	grep "^in-pack: 18" count.shallow
 +'
  
 -test_expect_success "clone shallow object count (part 2)" '
 -	test -z "$(count_output count.shallow)"
 +test_expect_success 'clone shallow object count (part 2)' '
 +	sed -e "/^in-pack:/d" -e "/^packs:/d" -e "/^size-pack:/d" \
 +	    -e "/: 0$/d" count.shallow > count_output &&
 +	! test -s count_output
  '
  
 -test_expect_success "fsck in shallow repo" \
 -	"(cd shallow; git fsck --full)"
 +test_expect_success 'fsck in shallow repo' '
 +	(
 +		cd shallow &&
 +		git fsck --full
 +	)
 +'
  
+ test_expect_success 'simple fetch in shallow repo' '
+ 	(
+ 		cd shallow &&
+ 		git fetch
+ 	)
+ '
+ 
+ test_expect_success 'no changes expected' '
+ 	(
+ 		cd shallow &&
+ 		git count-objects -v
+ 	) > count.shallow.2 &&
+ 	cmp count.shallow count.shallow.2
+ '
+ 
+ test_expect_success 'fetch same depth in shallow repo' '
+ 	(
+ 		cd shallow &&
+ 		git fetch --depth=2
+ 	)
+ '
+ 
+ test_expect_success 'no changes expected' '
+ 	(
+ 		cd shallow &&
+ 		git count-objects -v
+ 	) > count.shallow.3 &&
+ 	cmp count.shallow count.shallow.3
+ '
+ 
 -add B66 $B65
 -add B67 $B66
 +test_expect_success 'add two more' '
 +	add B66 $B65 &&
 +	add B67 $B66
 +'
  
 -test_expect_success "pull in shallow repo" \
 -	"(cd shallow; git pull .. B)"
 +test_expect_success 'pull in shallow repo' '
 +	(
 +		cd shallow &&
 +		git pull .. B
 +	)
 +'
  
 -(cd shallow; git count-objects -v) > count.shallow
 -test_expect_success "clone shallow object count" \
 -	"test \"count: 6\" = \"$(grep count count.shallow)\""
 +test_expect_success 'clone shallow object count' '
 +	(
 +		cd shallow &&
 +		git count-objects -v
 +	) > count.shallow &&
 +	grep "^count: 6" count.shallow
 +'
  
 -add B68 $B67
 -add B69 $B68
 +test_expect_success 'add two more (part 2)' '
 +	add B68 $B67 &&
 +	add B69 $B68
 +'
  
 -test_expect_success "deepening pull in shallow repo" \
 -	"(cd shallow; git pull --depth 4 .. B)"
 +test_expect_success 'deepening pull in shallow repo' '
 +	(
 +		cd shallow &&
 +		git pull --depth 4 .. B
 +	)
 +'
  
 -(cd shallow; git count-objects -v) > count.shallow
 -test_expect_success "clone shallow object count" \
 -	"test \"count: 12\" = \"$(grep count count.shallow)\""
 +test_expect_success 'clone shallow object count' '
 +	(
 +		cd shallow &&
 +		git count-objects -v
 +	) > count.shallow &&
 +	grep "^count: 12" count.shallow
 +'
  
 -test_expect_success "deepening fetch in shallow repo" \
 -	"(cd shallow; git fetch --depth 4 .. A:A)"
 +test_expect_success 'deepening fetch in shallow repo' '
 +	(
 +		cd shallow &&
 +		git fetch --depth 4 .. A:A
 +	)
 +'
  
 -(cd shallow; git count-objects -v) > count.shallow
 -test_expect_success "clone shallow object count" \
 -	"test \"count: 18\" = \"$(grep count count.shallow)\""
 +test_expect_success 'clone shallow object count' '
 +	(
 +		cd shallow &&
 +		git count-objects -v
 +	) > count.shallow &&
 +	grep "^count: 18" count.shallow
 +'
  
 -test_expect_success "pull in shallow repo with missing merge base" \
 -	"(cd shallow && test_must_fail git pull --depth 4 .. A)"
 +test_expect_success 'pull in shallow repo with missing merge base' '
 +	(
 +		cd shallow &&
 +		test_must_fail git pull --depth 4 .. A
 +	)
 +'
  
+ test_expect_success 'additional simple shallow deepenings' '
+ 	(
+ 		cd shallow &&
+ 		git fetch --depth=8 &&
+ 		git fetch --depth=10 &&
+ 		git fetch --depth=11
+ 	)
+ '
+ 
+ test_expect_success 'clone shallow object count' '
+ 	(
+ 		cd shallow &&
+ 		git count-objects -v
+ 	) > count.shallow &&
+ 	grep "^count: 52" count.shallow
+ '
+ 
  test_done