gitmodules(5) sayeth:
submodule.<name>.branch
A remote branch name for tracking updates in the upstream
submodule. If the option is not specified, it defaults to master.
This doesn't allow having a "pinned" submodule that should not be updated
from upstream. We should change this to have no default --- if branch is
not specified, don't update that submodule, just like in Gerrit's
corresponding feature[1].
[1] https://gerrit-review.googlesource.com/Documentation/user-submodules.html#_defining_the_submodule_branch
Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx>
---
Documentation/gitmodules.txt | 11 ++++++-----
git-submodule.sh | 19 +++++++++++--------
t/t7406-submodule-update.sh | 22 ++++++++++++++++++++++
3 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 4d63def2069..3b8739f8294 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -50,11 +50,12 @@ submodule.<name>.update::
submodule.<name>.branch::
A remote branch name for tracking updates in the upstream submodule.
- If the option is not specified, it defaults to 'master'. A special
- value of `.` is used to indicate that the name of the branch in the
- submodule should be the same name as the current branch in the
- current repository. See the `--remote` documentation in
- linkgit:git-submodule[1] for details.
+ A special value of `.` is used to indicate that the name of the
+ branch in the submodule should be the same name as the current
+ branch in the current repository. See the `--remote` documentation
+ in linkgit:git-submodule[1] for details.
+ If the option is not specified, do not update to any branch but
+ the object id of the remote.
submodule.<name>.fetchRecurseSubmodules::
This option can be used to control recursive fetching of this
diff --git a/git-submodule.sh b/git-submodule.sh
index f7fd80345cd..342050ae934 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -568,16 +568,19 @@ cmd_update()
if test -n "$remote"
then
branch=$(git submodule--helper remote-branch "$sm_path")
- if test -z "$nofetch"
+ if test -n "$branch"
then
- # Fetch remote before determining tracking $sha1
- fetch_in_submodule "$sm_path" $depth ||
- die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
+ if test -z "$nofetch"
+ then
+ # Fetch remote before determining tracking $sha1
+ fetch_in_submodule "$sm_path" $depth ||
+ die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
+ fi
+ remote_name=$(sanitize_submodule_env; cd "$sm_path" && get_default_remote)
+ sha1=$(sanitize_submodule_env; cd "$sm_path" &&
+ git rev-parse --verify "${remote_name}/${branch}") ||
+ die "$(eval_gettext "Unable to find current \${remote_name}/\${branch} revision in submodule path '\$sm_path'")"
fi
- remote_name=$(sanitize_submodule_env; cd "$sm_path" && get_default_remote)
- sha1=$(sanitize_submodule_env; cd "$sm_path" &&
- git rev-parse --verify "${remote_name}/${branch}") ||
- die "$(eval_gettext "Unable to find current \${remote_name}/\${branch} revision in submodule path '\$sm_path'")"
fi
if ! $(git config -f "$(git rev-parse --git-common-dir)/modules/$name/config" core.worktree) 2>/dev/null
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 10dc91620a6..f04884743fd 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -260,6 +260,28 @@ test_expect_success 'submodule update --remote should fetch upstream changes wit
)
'
+test_expect_success 'submodule update --remote should not fetch upstream when no branch is set' '
+ (
+ cd super &&
+ test_might_fail git config --unset -f .gitmodules submodule."submodule".branch &&
+ git add .gitmodules &&
+ git commit --allow-empty -m "submodules: pin in superproject branch"
+ ) &&
+ (
+ cd submodule &&
+ echo line4b >>file &&
+ git add file &&
+ test_tick &&
+ git commit -m "upstream line4b"
+ ) &&
+ (
+ cd super &&
+ git submodule update --remote --force submodule &&
+ git -C submodule log -1 --oneline >actual &&
+ ! grep line4b actual
+ )
+'
+
test_expect_success 'local config should override .gitmodules branch' '
(cd submodule &&
git checkout test-branch &&
--
2.19.0.rc2.392.g5ba43deb5a-goog
