summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-01-31 18:05:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-01-31 18:05:57 (GMT)
commit597a63054241c122515c93cbce45bc44eb231f18 (patch)
tree526c66ede4cb568cfa978e54f702e0c5d38cfd8e /t
parent7ed863a85a6ce2c4ac4476848310b8f917ab41f9 (diff)
parenta2a564686feddb290afa79c7c18e7939b8ac064e (diff)
downloadgit-597a63054241c122515c93cbce45bc44eb231f18.zip
git-597a63054241c122515c93cbce45bc44eb231f18.tar.gz
git-597a63054241c122515c93cbce45bc44eb231f18.tar.bz2
Merge branch 'jl/fetch-submodule-recursive' into maint
* jl/fetch-submodule-recursive: t5526: Fix wrong argument order in "git config"
Diffstat (limited to 't')
-rwxr-xr-xt/t5526-fetch-submodules.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index 884a5e5..a5f4585 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 &&