diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-10 15:24:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-10 15:24:28 -0800 |
| commit | da2b74eeec0b12d7b20d34a5e284295f81ad40a8 (patch) | |
| tree | 3259c3bf07a1439bb3be7f57b352aa58d609c318 /git.c | |
| parent | 2ced5f2c2ddcfe3a45d75ae1d552c11cad70236d (diff) | |
| parent | 7c4be458b1c7ba81b0cc63d76a144261eb2395be (diff) | |
| download | git-da2b74eeec0b12d7b20d34a5e284295f81ad40a8.tar.gz git-da2b74eeec0b12d7b20d34a5e284295f81ad40a8.tar.xz | |
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.c')
| -rw-r--r-- | git.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -493,7 +493,7 @@ static struct cmd_struct commands[] = { { "stage", cmd_add, RUN_SETUP | NEED_WORK_TREE }, { "status", cmd_status, RUN_SETUP | NEED_WORK_TREE }, { "stripspace", cmd_stripspace }, - { "submodule--helper", cmd_submodule__helper, RUN_SETUP }, + { "submodule--helper", cmd_submodule__helper, RUN_SETUP | SUPPORT_SUPER_PREFIX}, { "symbolic-ref", cmd_symbolic_ref, RUN_SETUP }, { "tag", cmd_tag, RUN_SETUP }, { "unpack-file", cmd_unpack_file, RUN_SETUP }, |