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 /repository.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 'repository.h')
| -rw-r--r-- | repository.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/repository.h b/repository.h index 09df94a472..6041367f08 100644 --- a/repository.h +++ b/repository.h @@ -97,6 +97,9 @@ extern void repo_set_gitdir(struct repository *repo, extern void repo_set_worktree(struct repository *repo, const char *path); extern void repo_set_hash_algo(struct repository *repo, int algo); extern void initialize_the_repository(void); +extern int repo_init(struct repository *r, + const char *gitdir, + const char *worktree); extern int repo_submodule_init(struct repository *submodule, struct repository *superproject, const char *path); |