diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-01-31 10:05:57 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-01-31 10:05:57 -0800 |
commit | 597a63054241c122515c93cbce45bc44eb231f18 (patch) | |
tree | 526c66ede4cb568cfa978e54f702e0c5d38cfd8e /t/t5526-fetch-submodules.sh | |
parent | Git 1.7.4 (diff) | |
parent | t5526: Fix wrong argument order in "git config" (diff) | |
download | tgif-597a63054241c122515c93cbce45bc44eb231f18.tar.xz |
Merge branch 'jl/fetch-submodule-recursive' into maint
* jl/fetch-submodule-recursive:
t5526: Fix wrong argument order in "git config"
Diffstat (limited to 't/t5526-fetch-submodules.sh')
-rwxr-xr-x | t/t5526-fetch-submodules.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh index 884a5e567c..a5f458533f 100755 --- a/t/t5526-fetch-submodules.sh +++ b/t/t5526-fetch-submodules.sh @@ -124,7 +124,7 @@ test_expect_success "--recurse-submodules overrides fetchRecurseSubmodules setti ( cd downstream && 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 ) && test_cmp expect.out actual.out && |