Rename sections from "module" to "submodule" in .gitmodules

Rename [module] to [submodule], so that it would be more
forward compatible with the proposed extension by harmonizing
the section names used in .gitmodules and .git/config.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-submodule.sh b/git-submodule.sh
index 4a6d64d61cdb2d0ca21cc4521a3955455ab3dd23..6c83c52cf422d44fd22b1df4e55da0de5e368581 100755 (executable)
--- 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 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"
 
                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 74fafceb716354075012b6714046415c4b3e5df6..9f2d4f9b38f199c04fb44d13d65659b1ff161d82 100755 (executable)
--- 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-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' '
 '
 
 test_expect_success 'status should only print one line' '