summaryrefslogtreecommitdiff
path: root/git-submodule.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-10 15:24:27 -0800
committerJunio C Hamano <gitster@pobox.com>2017-01-10 15:24:28 -0800
commitda2b74eeec0b12d7b20d34a5e284295f81ad40a8 (patch)
tree3259c3bf07a1439bb3be7f57b352aa58d609c318 /git-submodule.sh
parent2ced5f2c2ddcfe3a45d75ae1d552c11cad70236d (diff)
parent7c4be458b1c7ba81b0cc63d76a144261eb2395be (diff)
downloadgit-da2b74eeec0b12d7b20d34a5e284295f81ad40a8.tar.gz
Merge branch 'sb/submodule-embed-gitdir'
A new submodule helper "git submodule embedgitdirs" to make it easier to move embedded .git/ directory for submodules in a superproject to .git/modules/ (and point the latter with the former that is turned into a "gitdir:" file) has been added. * sb/submodule-embed-gitdir: worktree: initialize return value for submodule_uses_worktrees submodule: add absorb-git-dir function move connect_work_tree_and_git_dir to dir.h worktree: check if a submodule uses worktrees test-lib-functions.sh: teach test_commit -C <dir> submodule helper: support super prefix submodule: use absolute path for computing relative path connecting
Diffstat (limited to 'git-submodule.sh')
-rwxr-xr-xgit-submodule.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index 0a477b4c97..554bd1c494 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -1127,6 +1127,11 @@ cmd_sync()
done
}
+cmd_absorbgitdirs()
+{
+ git submodule--helper absorb-git-dirs --prefix "$wt_prefix" "$@"
+}
+
# This loop parses the command line arguments to find the
# subcommand name to dispatch. Parsing of the subcommand specific
# options are primarily done by the subcommand implementations.
@@ -1136,7 +1141,7 @@ cmd_sync()
while test $# != 0 && test -z "$command"
do
case "$1" in
- add | foreach | init | deinit | update | status | summary | sync)
+ add | foreach | init | deinit | update | status | summary | sync | absorbgitdirs)
command=$1
;;
-q|--quiet)