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 /submodule.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 'submodule.h')
| -rw-r--r-- | submodule.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/submodule.h b/submodule.h index 9589f13127..e5526f6aaa 100644 --- a/submodule.h +++ b/submodule.h @@ -105,7 +105,6 @@ extern int push_unpushed_submodules(struct oid_array *commits, const char **refspec, int refspec_nr, const struct string_list *push_options, int dry_run); -extern void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir); /* * Given a submodule path (as in the index), return the repository * path of that submodule in 'buf'. Return -1 on error or when the |