git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v6 06/10] submodule: use the 'submodule--helper config' command

From
Antonio Ospite <ao2@ao2.it>
Date
Oct 5, 2018, 13:05 UTC
Message-ID
<20181005130601.15879-7-ao2@ao2.it>
In-Reply-To
<20181005130601.15879-1-ao2@ao2.it>

Use the 'submodule--helper config' command in git-submodules.sh to avoid referring explicitly to .gitmodules by the hardcoded file path.

This makes it possible to access the submodules configuration in a more controlled way.

Signed-off-by: Antonio Ospite <ao2@ao2.it>
---
 git-submodule.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 1b568e29b9..0805fadf47 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -72,7 +72,7 @@ get_submodule_config () {
 	value=$(git config submodule."$name"."$option")
 	if test -z "$value"
 	then
-		value=$(git config -f .gitmodules submodule."$name"."$option")
+		value=$(git submodule--helper config submodule."$name"."$option")
 	fi
 	printf '%s' "${value:-$default}"
 }
@@ -283,11 +283,11 @@ or you are unsure what this means choose another name with the '--name' option."
 	git add --no-warn-embedded-repo $force "$sm_path" ||
 	die "$(eval_gettext "Failed to add submodule '\$sm_path'")"
 
-	git config -f .gitmodules submodule."$sm_name".path "$sm_path" &&
-	git config -f .gitmodules submodule."$sm_name".url "$repo" &&
+	git submodule--helper config submodule."$sm_name".path "$sm_path" &&
+	git submodule--helper config submodule."$sm_name".url "$repo" &&
 	if test -n "$branch"
 	then
-		git config -f .gitmodules submodule."$sm_name".branch "$branch"
+		git submodule--helper config submodule."$sm_name".branch "$branch"
 	fi &&
 	git add --force .gitmodules ||
 	die "$(eval_gettext "Failed to register submodule '\$sm_path'")"
-- 
2.19.0
Previous: Antonio OspiteNext: Antonio Ospite
Message 13 of 23 in “Make submodules work if .gitmodules is not checked out”
  1. 00/10 Make submodules work if .gitmodules is not checked outAntonio Ospite, Oct 5, 2018
  2. 03/10 t7411: merge tests 5 and 6Antonio Ospite, Oct 5, 2018
  3. 09/10 submodule: support reading .gitmodules when it's not in the working treeAntonio Ospite, Oct 5, 2018
  4. Stefan BellerOct 8, 2018
  5. Antonio OspiteOct 10, 2018
  6. Stefan BellerOct 10, 2018
  7. Junio C HamanoOct 9, 2018
  8. Junio C HamanoOct 9, 2018
  9. 04/10 t7411: be nicer to future tests and really clean things upAntonio Ospite, Oct 5, 2018
  10. 10/10 t/helper: add test-submodule-nested-repo-configAntonio Ospite, Oct 5, 2018
  11. 02/10 submodule: factor out a config_set_in_gitmodules_file_gently functionAntonio Ospite, Oct 5, 2018
  12. 01/10 submodule: add a print_config_from_gitmodules() helperAntonio Ospite, Oct 5, 2018
  13. 06/10 submodule: use the 'submodule--helper config' commandAntonio Ospite, Oct 5, 2018
  14. 05/10 submodule--helper: add a new 'config' subcommandAntonio Ospite, Oct 5, 2018
  15. 08/10 submodule: add a helper to check if it is safe to write to .gitmodulesAntonio Ospite, Oct 5, 2018
  16. Stefan BellerOct 5, 2018
  17. Antonio OspiteOct 6, 2018
  18. Junio C HamanoOct 6, 2018
  19. Antonio OspiteOct 8, 2018
  20. 07/10 t7506: clean up .gitmodules properly before setting up new scenarioAntonio Ospite, Oct 5, 2018
  21. Antonio OspiteOct 6, 2018
  22. Junio C HamanoOct 25, 2018
  23. Antonio OspiteOct 25, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.