On 6/10/07, Junio C Hamano <gitster@xxxxxxxxx> wrote: > "Lars Hjemli" <hjemli@xxxxxxxxx> writes: > > > Hmm, maybe I should just rename [module] to [submodule] right now? It > > would be better forward compatible with the proposed extension, it > > would 'harmonize' the section names used in .gitmodules and > > .git/config, and it would offer a clean break from what's currently > > supported in 'master'. > > Yes, the difference between '[submodule]' vs '[module]' in > .git/config and .gitmodules confused me while looking at your > latest patch series. I am in favor of unifying them. We would > not be breaking any released version if we harmonize them now. Here it is. Signed-off-by: Lars Hjemli <hjemli@xxxxxxxxx> --- This seem to be a bad mail day for me. I'm resending this patch since someone apparently ate the previous one :-( git-submodule.sh | 2 +- t/t7400-submodule-basic.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index 4a6d64d..6c83c52 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -66,7 +66,7 @@ modules_init() url=$(git-config submodule."$path".url) test -z "$url" || continue - url=$(GIT_CONFIG=.gitmodules git-config module."$path".url) + url=$(GIT_CONFIG=.gitmodules git-config submodule."$path".url) test -z "$url" && die "No url found for submodule '$path' in .gitmodules" diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 74fafce..9f2d4f9 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -40,7 +40,7 @@ test_expect_success 'Prepare submodule testing' ' git-add a lib z && git-commit -m "super commit 1" && mv lib .subrepo && - GIT_CONFIG=.gitmodules git-config module.lib.url git://example.com/lib.git + GIT_CONFIG=.gitmodules git-config submodule.lib.url git://example.com/lib.git ' test_expect_success 'status should only print one line' ' -- 1.5.2.1.914.gbd3a7 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
