Skip to contentSkip to conversation

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

PATCH In review Lars Hjemli 1 participant 1 message Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 3/5 Rename sections from "module" to "submodule" in .gitmodules

Quoted 8 lines · Junio C Hamano
Quoted 5 lines · Lars Hjemli

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'.

Quoted 4 lines

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.

---
  git-submodule.sh           |    2 +-
  t/t7400-submodule-basic.sh |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
git-submodule.sh +1 -1
index 4a6d64d..6c83c52 100755
@@ -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"
 
t/t7400-submodule-basic.sh +1 -1
index 74fafce..9f2d4f9 100755
@@ -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' '
Signature · 1 line
1.5.2.1.914.gbd3a7