From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Jul 2016 20:38:17 +0000 (-0700)
Subject: Merge branch 'sb/t5614-modernize'
X-Git-Tag: v2.10.0-rc0~147
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8db528cf5ad8026c7c547bb390437d605b484ead;p=thirdparty%2Fgit.git

Merge branch 'sb/t5614-modernize'

Test clean-up.

* sb/t5614-modernize:
  t5614: don't use subshells
---

8db528cf5ad8026c7c547bb390437d605b484ead
diff --cc t/t5614-clone-submodules.sh
index ea78f1ff31,da2a67f656..a87d329656
--- a/t/t5614-clone-submodules.sh
+++ b/t/t5614-clone-submodules.sh
@@@ -85,68 -61,10 +61,62 @@@ test_expect_success 'shallow clone wit
  test_expect_success 'non shallow clone with shallow submodule' '
  	test_when_finished "rm -rf super_clone" &&
  	git clone --recurse-submodules --no-local --shallow-submodules "file://$pwd/." super_clone &&
- 	(
- 		cd super_clone &&
- 		git log --oneline >lines &&
- 		test_line_count = 3 lines
- 	) &&
- 	(
- 		cd super_clone/sub &&
- 		git log --oneline >lines &&
- 		test_line_count = 1 lines
- 	)
+ 	git -C super_clone log --oneline >lines &&
+ 	test_line_count = 3 lines &&
+ 	git -C super_clone/sub log --oneline >lines &&
+ 	test_line_count = 1 lines
  '
  
 +test_expect_success 'clone follows shallow recommendation' '
 +	test_when_finished "rm -rf super_clone" &&
 +	git config -f .gitmodules submodule.sub.shallow true &&
 +	git add .gitmodules &&
 +	git commit -m "recommed shallow for sub" &&
 +	git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&
 +	(
 +		cd super_clone &&
 +		git log --oneline >lines &&
 +		test_line_count = 4 lines
 +	) &&
 +	(
 +		cd super_clone/sub &&
 +		git log --oneline >lines &&
 +		test_line_count = 1 lines
 +	)
 +'
 +
 +test_expect_success 'get unshallow recommended shallow submodule' '
 +	test_when_finished "rm -rf super_clone" &&
 +	git clone --no-local "file://$pwd/." super_clone &&
 +	(
 +		cd super_clone &&
 +		git submodule update --init --no-recommend-shallow &&
 +		git log --oneline >lines &&
 +		test_line_count = 4 lines
 +	) &&
 +	(
 +		cd super_clone/sub &&
 +		git log --oneline >lines &&
 +		test_line_count = 3 lines
 +	)
 +'
 +
 +test_expect_success 'clone follows non shallow recommendation' '
 +	test_when_finished "rm -rf super_clone" &&
 +	git config -f .gitmodules submodule.sub.shallow false &&
 +	git add .gitmodules &&
 +	git commit -m "recommed non shallow for sub" &&
 +	git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&
 +	(
 +		cd super_clone &&
 +		git log --oneline >lines &&
 +		test_line_count = 5 lines
 +	) &&
 +	(
 +		cd super_clone/sub &&
 +		git log --oneline >lines &&
 +		test_line_count = 3 lines
 +	)
 +'
 +
  test_done