aboutsummaryrefslogtreecommitdiff
path: root/git-stash.sh
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2016-08-03 13:44:04 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-03 16:13:22 -0700
commit4d7bc52b178bffe9e484c4dcd92d5353e2ce716f (patch)
treeba288f6c41fbf521524e7ee3181e2bbec9cde761 /git-stash.sh
parent92bbe7ccf1fedac825f2c6ab4c8de91dc5370fd2 (diff)
downloadgit-4d7bc52b178bffe9e484c4dcd92d5353e2ce716f.tar.gz
git-4d7bc52b178bffe9e484c4dcd92d5353e2ce716f.tar.xz
submodule update: allow '.' for branch value
Gerrit has a "superproject subscription" feature[1], that triggers a commit in a superproject that is subscribed to its submodules. Conceptually this Gerrit feature can be done on the client side with Git via (except for raciness, error handling etc): while [ true ]; do git -C <superproject> submodule update --remote --force git -C <superproject> commit -a -m "Update submodules" git -C <superproject> push done for each branch in the superproject. To ease the configuration in Gerrit a special value of "." has been introduced for the submodule.<name>.branch to mean the same branch as the superproject[2], such that you can create a new branch on both superproject and the submodule and this feature continues to work on that new branch. Now we find projects in the wild with such a .gitmodules file. The .gitmodules used in these Gerrit projects do not conform to Gits understanding of how .gitmodules should look like. This teaches Git to deal gracefully with this syntax as well. The redefinition of "." does no harm to existing projects unaware of this change, as "." is an invalid branch name in Git, so we do not expect such projects to exist. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-stash.sh')
0 files changed, 0 insertions, 0 deletions