Merge branch 'jl/fetch-submodule-recursive' into maint

* jl/fetch-submodule-recursive:
  t5526: Fix wrong argument order in "git config"
This commit is contained in:
Junio C Hamano 2011-01-31 10:05:57 -08:00
commit 597a630542

View File

@ -124,7 +124,7 @@ test_expect_success "--recurse-submodules overrides fetchRecurseSubmodules setti
( (
cd downstream && cd downstream &&
git fetch --recurse-submodules >../actual.out 2>../actual.err && git fetch --recurse-submodules >../actual.out 2>../actual.err &&
git config -f --unset .gitmodules submodule.submodule.fetchRecurseSubmodules true && git config --unset -f .gitmodules submodule.submodule.fetchRecurseSubmodules &&
git config --unset submodule.submodule.fetchRecurseSubmodules git config --unset submodule.submodule.fetchRecurseSubmodules
) && ) &&
test_cmp expect.out actual.out && test_cmp expect.out actual.out &&