diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-28 15:15:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-28 15:15:42 -0700 |
| commit | b6b210c5e1705c28274ac2e83a500644c126dd9a (patch) | |
| tree | 979bb6f55b5b769f7e8053bcc52fc49e42a4802d /repository.c | |
| parent | Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-f... (diff) | |
| parent | refs: drop "broken" flag from for_each_fullref_in() (diff) | |
| download | tgif-b6b210c5e1705c28274ac2e83a500644c126dd9a.tar.xz | |
Merge branch 'jk/ref-paranoia' into jt/no-abuse-alternate-odb-for-submodules
* jk/ref-paranoia: (71 commits)
refs: drop "broken" flag from for_each_fullref_in()
ref-filter: drop broken-ref code entirely
ref-filter: stop setting FILTER_REFS_INCLUDE_BROKEN
repack, prune: drop GIT_REF_PARANOIA settings
refs: turn on GIT_REF_PARANOIA by default
refs: omit dangling symrefs when using GIT_REF_PARANOIA
refs: add DO_FOR_EACH_OMIT_DANGLING_SYMREFS flag
refs-internal.h: reorganize DO_FOR_EACH_* flag documentation
refs-internal.h: move DO_FOR_EACH_* flags next to each other
t5312: be more assertive about command failure
t5312: test non-destructive repack
t5312: create bogus ref as necessary
t5312: drop "verbose" helper
t5600: provide detached HEAD for corruption failures
t5516: don't use HEAD ref for invalid ref-deletion tests
t7900: clean up some more broken refs
The eighth batch
t0000: avoid masking git exit value through pipes
tree-diff: fix leak when not HAVE_ALLOCA_H
pack-revindex.h: correct the time complexity descriptions
...
Diffstat (limited to 'repository.c')
| -rw-r--r-- | repository.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/repository.c b/repository.c index e4a1afb0ac..c5b90ba93e 100644 --- a/repository.c +++ b/repository.c @@ -216,8 +216,7 @@ int repo_submodule_init(struct repository *subrepo, } strbuf_reset(&gitdir); - strbuf_repo_git_path(&gitdir, superproject, - "modules/%s", sub->name); + submodule_name_to_gitdir(&gitdir, superproject, sub->name); if (repo_init(subrepo, gitdir.buf, NULL)) { ret = -1; |