[PATCH 4/7] git-submodule: Fall back on .gitmodules if info not found in $GIT_DIR/config
From: Ping Yin <hidden>
Date: 2016-06-15 22:44:22
Subsystem:
the rest · Maintainer:
Linus Torvalds
Originally, the submodule workflow enforces 'git init' in the beginning which copies submodule config info from .gitmodules to $GIT_DIR/config. Then all subcommands except 'init' and 'add' fetch submodule info from $GIT_DIR/config and .gitmodules can be discarded. And there may be inconsistence between .git/config and .gitmodules when always using 'git init' at first. If upstream .gitmodules changes, it is not easy to sync the changes to $GIT_DIR/config. Running 'git init' again may not help. Since .git/config has a whole copy of .gitmodules, the user has no easy way to know which entries should follow the upstream changes and which entires shouldn't. Actually, .gitmodules which only acts as info hints can and should play a more important and essential role. As an analogy to .gitignore and .git/info/excludes which are for colleagues' and individual wishes separately, .gitmodules is for common requirements and $GIT_DIR/config is for special requirements. This patch implements a fall back strategy to satify both common and special requirements as follows. $GIT_DIR/config only keeps submodule info different from $GIT_DIR/config. And the info from $GIT_DIR/config take higher precedence. The code first consults $GIT_DIR/config and then fall back on in-tree .gitmodules file. With this patch, init subcommand becomes not forcefull and less meaningful. And now it becomes just a tool to help users copy info to $GIT_DIR/config (and then modify it) only when they need. Signed-off-by: Ping Yin <redacted> --- git-submodule.sh | 9 ++++----- t/t7400-submodule-basic.sh | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 0e14078..bd2934a 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh@@ -98,7 +98,8 @@ module_name() } module_url() { - git config submodule.$1.url + git config submodule.$1.url || + GIT_CONFIG=.gitmodules git config submodule.$1.url } module_info() {
@@ -256,12 +257,10 @@ cmd_init() while read sha1 path name url do test -n "$name" || exit - # Skip already registered paths - test -z "$url" || continue - - url=$(GIT_CONFIG=.gitmodules git config submodule."$name".url) test -z "$url" && die "No url found for submodule path '$path' in .gitmodules" + # Skip already registered paths + git config submodule.$name.url && continue url=$(absolute_url "$url") git config submodule."$name".url "$url" ||
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index e5d59b8..d9b48f7 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh@@ -174,6 +174,35 @@ test_expect_success 'status should be "up-to-date" after update' ' git-submodule status | grep "^ $rev1" ' +test_expect_success 'status should be "modified" after submodule reset --hard HEAD@{1}' ' + cd init && + git reset --hard HEAD@{1} + rev2=$(git rev-parse HEAD) && + cd .. && + if test -z "$rev2" + then + echo "[OOPS] submodule git rev-parse returned nothing" + false + fi && + git-submodule status | grep "^+$rev2" +' + +test_expect_success 'update should checkout rev1 when fall back' ' + git-config --unset submodule.example.url && + GIT_CONFIG=.gitmodules git config submodule.example.url .subrepo && + git-submodule update init && + head=$(cd init && git rev-parse HEAD) && + if test -z "$head" + then + echo "[OOPS] submodule git rev-parse returned nothing" + false + elif test "$head" != "$rev1" + then + echo "[OOPS] init did not checkout correct head" + false + fi +' + test_expect_success 'checkout superproject with subproject already present' ' git-checkout initial && git-checkout master
--
1.5.4.4.653.g7cf1e