Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-09-23 23:44:49 +0300
committerJunio C Hamano <gitster@pobox.com>2021-09-23 23:44:49 +0300
commitf7511fdfbd6dc249aca551d56fcb3011d85ddd08 (patch)
treea3ad3c5cac546e8f00fa84c31184f1ef92bf8018 /dir.c
parent188da7dc094e5930d1b83c5d97f8c70c926984eb (diff)
parentce125d431aaa7a12623a81267a221f64552ffd17 (diff)
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dir.c b/dir.c
index 8f5936a9cf..39fce3bcba 100644
--- a/dir.c
+++ b/dir.c
@@ -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);
}