]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/odb-generalize-prepare'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Jul 2026 15:27:27 +0000 (08:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Jul 2026 15:27:28 +0000 (08:27 -0700)
The 'reprepare()' callback for object database sources has been
generalized into a 'prepare()' callback with an optional flush cache
flag, and a new 'odb_prepare()' wrapper has been introduced to allow
pre-opening object database sources.

* ps/odb-generalize-prepare:
  odb: introduce `odb_prepare()`
  odb/source: generalize `reprepare()` callback

1  2 
builtin/grep.c
odb.c
odb.h
odb/source-files.c
odb/source-inmemory.c
odb/source-loose.c
odb/source-packed.c
odb/source-packed.h
odb/source.h
packfile.c

diff --cc builtin/grep.c
Simple merge
diff --cc odb.c
Simple merge
diff --cc odb.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc odb/source.h
Simple merge
diff --cc packfile.c
Simple merge