Re: What's cooking in git.git (Apr 2011, #02; Wed, 6)

From: Jens Lehmann <jens.lehmann@web.de>
Date: Apr 10, 2011, 22:55 UTC
Message-ID: <4DA23551.4040304@web.de>
In-Reply-To: <BANLkTinTVinnDLPnHGoF9DY97ky_MFiLAQ@mail.gmail.com>

Am 10.04.2011 20:52, schrieb Ævar Arnfjörð Bjarmason:

Show 13 quoted lines

> On Wed, Apr 6, 2011 at 22:04, Junio C Hamano <gitster@pobox.com> wrote:
> 
>> * jl/submodule-fetch-on-demand (2011-03-06) 7 commits
>>  (merged to 'next' on 2011-03-20 at a5e452d)
>>  + fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
>>  + submodule update: Don't fetch when the submodule commit is already present
>>  + fetch/pull: Don't recurse into a submodule when commits are already present
>>  + Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
>>  + config: teach the fetch.recurseSubmodules option the 'on-demand' value
>>  + fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
>>  + fetch/pull: recurse into submodules when necessary
> 
> This series needs to be fixed to not fail tests with GETTEXT_POISON=YesPlease.

Maybe something like this? Junio, do you want me to squash the changes in the patch series and resend it or should I send a new commit?

-----------------8<-------------

diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index af78e21..3279aec 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -230,7 +230,7 @@ test_expect_success "Recursion doesn't happen when no new commits are fetched in
 	! test -s actual.err
 '

-test_expect_success "Recursion stops when no new submodule commits are fetched" '
+test_expect_success C_LOCALE_OUTPUT "Recursion stops when no new submodule commits are fetched" '
 	head1=$(git rev-parse --short HEAD) &&
 	git add submodule &&
 	git commit -m "new submodule" &&
@@ -247,7 +247,7 @@ test_expect_success "Recursion stops when no new submodule commits are fetched"
 	test_cmp expect.out.sub actual.out
 '

-test_expect_success "Recursion doesn't happen when new superproject commits don't change any submodules" '
+test_expect_success C_LOCALE_OUTPUT "Recursion doesn't happen when new superproject commits don't change any submodules" '
 	add_upstream_commit &&
 	head1=$(git rev-parse --short HEAD) &&
 	echo a > file &&
@@ -264,7 +264,7 @@ test_expect_success "Recursion doesn't happen when new superproject commits don'
 	test_cmp expect.err.file actual.err
 '

-test_expect_success "Recursion picks up config in submodule" '
+test_expect_success C_LOCALE_OUTPUT "Recursion picks up config in submodule" '
 	(
 		cd downstream &&
 		git fetch --recurse-submodules &&
@@ -293,7 +293,7 @@ test_expect_success "Recursion picks up config in submodule" '
 	test_cmp expect.out actual.out
 '

-test_expect_success "Recursion picks up all submodules when necessary" '
+test_expect_success C_LOCALE_OUTPUT "Recursion picks up all submodules when necessary" '
 	add_upstream_commit &&
 	(
 		cd submodule &&
@@ -351,7 +351,7 @@ test_expect_success "'--recurse-submodules=on-demand' doesn't recurse when no ne
 	! test -s actual.err
 '

-test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)" '
+test_expect_success C_LOCALE_OUTPUT "'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)" '
 	head1=$(git rev-parse --short HEAD) &&
 	git add submodule &&
 	git commit -m "new submodule" &&
@@ -379,7 +379,7 @@ test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necess
 	test_cmp expect.err actual.err
 '

-test_expect_success "'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)" '
+test_expect_success C_LOCALE_OUTPUT "'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)" '
 	add_upstream_commit &&
 	head1=$(git rev-parse --short HEAD) &&
 	echo a >> file &&
@@ -396,7 +396,7 @@ test_expect_success "'--recurse-submodules=on-demand' stops when no new submodul
 	test_cmp expect.err.file actual.err
 '

-test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config" '
+test_expect_success C_LOCALE_OUTPUT "'fetch.recurseSubmodules=on-demand' overrides global config" '
 	(
 		cd downstream &&
 		git fetch --recurse-submodules
@@ -424,7 +424,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config
 	test_cmp expect.err.2 actual.err
 '

-test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules" '
+test_expect_success C_LOCALE_OUTPUT "'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules" '
 	(
 		cd downstream &&
 		git fetch --recurse-submodules
@@ -452,7 +452,7 @@ test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' override
 	test_cmp expect.err.2 actual.err
 '

-test_expect_success "don't fetch submodule when newly recorded commits are already present" '
+test_expect_success C_LOCALE_OUTPUT "don't fetch submodule when newly recorded commits are already present" '
 	(
 		cd submodule &&
 		git checkout -q HEAD^^