From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Sep 2021 22:15:42 +0000 (-0700)
Subject: Merge branch 'jk/ref-paranoia' into jt/no-abuse-alternate-odb-for-submodules
X-Git-Tag: v2.34.0-rc0~40^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6b210c5e1705c28274ac2e83a500644c126dd9a;p=thirdparty%2Fgit.git

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
  ...
---

b6b210c5e1705c28274ac2e83a500644c126dd9a
diff --cc repository.c
index e4a1afb0ac,710a3b4bf8..c5b90ba93e
--- a/repository.c
+++ b/repository.c
@@@ -208,16 -212,8 +208,15 @@@ int repo_submodule_init(struct reposito
  		 * in the superproject's 'modules' directory.  In this case the
  		 * submodule would not have a worktree.
  		 */
 +		const struct submodule *sub =
 +			submodule_from_path(superproject, treeish_name, path);
 +		if (!sub) {
 +			ret = -1;
 +			goto out;
 +		}
 +
  		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;