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

diff --cc builtin/submodule--helper.c
Simple merge

diff --cc repository.c
index e4a1afb0acac4cee810ae2f6a5af4334f9cdc572,710a3b4bf872fb0db64f859d5c49d085c198f089..c5b90ba93ea816c62eeaf73433e65e2730827063
--- 1/repository.c
--- 2/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;

diff --cc revision.c
Simple merge

diff --cc submodule.c
Simple merge