diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-05-08 15:59:17 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 15:59:17 +0900 |
commit | 0c7ecb7c311d393db41f4d81a113ffc5f3b4498f (patch) | |
tree | 1b96e0dd82a0396aa205637d120ab1caac74fbe3 /dir.h | |
parent | 92034a9cd5e71cf686ef66029433bdaba75027b0 (diff) | |
parent | da62f786d2df60f3c8255cf4cbbcd9c1f9458d99 (diff) | |
download | git-0c7ecb7c311d393db41f4d81a113ffc5f3b4498f.tar.gz |
Merge branch 'sb/submodule-move-nested'
Moving a submodule that itself has submodule in it with "git mv"
forgot to make necessary adjustment to the nested sub-submodules;
now the codepath learned to recurse into the submodules.
* sb/submodule-move-nested:
submodule: fixup nested submodules after moving the submodule
submodule-config: remove submodule_from_cache
submodule-config: add repository argument to submodule_from_{name, path}
submodule-config: allow submodule_free to handle arbitrary repositories
grep: remove "repo" arg from non-supporting funcs
submodule.h: drop declaration of connect_work_tree_and_git_dir
Diffstat (limited to 'dir.h')
-rw-r--r-- | dir.h | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -359,7 +359,17 @@ struct untracked_cache *read_untracked_extension(const void *data, unsigned long void write_untracked_extension(struct strbuf *out, struct untracked_cache *untracked); void add_untracked_cache(struct index_state *istate); void remove_untracked_cache(struct index_state *istate); -extern void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir); + +/* + * Connect a worktree to a git directory by creating (or overwriting) a + * '.git' file containing the location of the git directory. In the git + * directory set the core.worktree setting to indicate where the worktree is. + * When `recurse_into_nested` is set, recurse into any nested submodules, + * connecting them as well. + */ +extern void connect_work_tree_and_git_dir(const char *work_tree, + const char *git_dir, + int recurse_into_nested); extern void relocate_gitdir(const char *path, const char *old_git_dir, const char *new_git_dir); |