Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jl/fetch-submodule-recursive' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 31 Jan 2011 18:05:57 +0000
(10:05 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 31 Jan 2011 18:05:57 +0000
(10:05 -0800)
* jl/fetch-submodule-recursive:
t5526: Fix wrong argument order in "git config"
t/t5526-fetch-submodules.sh
patch
|
blob
|
history
raw
(from parent 1:
7ed863a
)
diff --git
a/t/t5526-fetch-submodules.sh
b/t/t5526-fetch-submodules.sh
index 884a5e567c308e976ce50036dc93c3932b717603..a5f458533fd071c13550a72bf251e2e10c109637 100755
(executable)
--- 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 &&