diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-23 13:44:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-23 13:44:49 -0700 |
| commit | f7511fdfbd6dc249aca551d56fcb3011d85ddd08 (patch) | |
| tree | a3ad3c5cac546e8f00fa84c31184f1ef92bf8018 /dir.c | |
| parent | Merge branch 'ma/doc-git-version' (diff) | |
| parent | submodule: extract path to submodule gitdir func (diff) | |
| download | tgif-f7511fdfbd6dc249aca551d56fcb3011d85ddd08.tar.xz | |
Merge branch 'jt/submodule-name-to-gitdir'
Code refactoring.
* jt/submodule-name-to-gitdir:
submodule: extract path to submodule gitdir func
Diffstat (limited to 'dir.c')
| -rw-r--r-- | dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3799,7 +3799,7 @@ static void connect_wt_gitdir_in_nested(const char *sub_worktree, strbuf_reset(&sub_wt); strbuf_reset(&sub_gd); strbuf_addf(&sub_wt, "%s/%s", sub_worktree, sub->path); - strbuf_addf(&sub_gd, "%s/modules/%s", sub_gitdir, sub->name); + submodule_name_to_gitdir(&sub_gd, &subrepo, sub->name); connect_work_tree_and_git_dir(sub_wt.buf, sub_gd.buf, 1); } |