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

gitster · gitster · commit 597a63054241 · 2011-01-31T10:05:57.000-08:00
* jl/fetch-submodule-recursive:
  t5526: Fix wrong argument order in "git config"
diff --git 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 &&

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ test_expect_success "--recurse-submodules overrides fetchRecurseSubmodules setti`
`124`	`124`	`(`
`125`	`125`	`cd downstream &&`
`126`	`126`	`git fetch --recurse-submodules >../actual.out 2>../actual.err &&`
`127`		`- git config -f --unset .gitmodules submodule.submodule.fetchRecurseSubmodules true &&`
	`127`	`+ git config --unset -f .gitmodules submodule.submodule.fetchRecurseSubmodules &&`
`128`	`128`	`git config --unset submodule.submodule.fetchRecurseSubmodules`
`129`	`129`	`) &&`
`130`	`130`	`test_cmp expect.out actual.out &&`