]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jt/no-abuse-alternate-odb-for-submodules'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Oct 2021 23:06:56 +0000 (16:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Oct 2021 23:06:56 +0000 (16:06 -0700)
Follow through the work to use the repo interface to access
submodule objects in-process, instead of abusing the alternate
object database interface.

* jt/no-abuse-alternate-odb-for-submodules:
  submodule: trace adding submodule ODB as alternate
  submodule: pass repo to check_has_commit()
  object-file: only register submodule ODB if needed
  merge-{ort,recursive}: remove add_submodule_odb()
  refs: peeling non-the_repository iterators is BUG
  refs: teach arbitrary repo support to iterators
  refs: plumb repo into ref stores

12 files changed:
1  2 
merge-ort.c
merge-recursive.c
object-file.c
refs.c
refs/files-backend.c
refs/packed-backend.c
refs/ref-cache.c
refs/ref-cache.h
refs/refs-internal.h
strbuf.h
submodule.c
t/README

diff --cc merge-ort.c
Simple merge
Simple merge
diff --cc object-file.c
Simple merge
diff --cc refs.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc strbuf.h
Simple merge
diff --cc submodule.c
Simple merge
diff --cc t/README
Simple merge