[pull] master from git:master - #248

Merged

pull[bot] merged 51 commits into

turkdevops:masterfrom

Aug 24, 2026

Commits on Jul 11, 2026

Merge branch 'kk/commit-reach-find-all-fix' into kk/merge-base-exhaustion
gitster
committed
9175f6c

Commits on Jul 25, 2026

Merge branch 'ps/cat-file-remote-object-info' into ps/cat-file-remote-object-info-type
gitster
committed
669c4ad

Commits on Aug 5, 2026

odb/streaming: track write stream size in the structure

pks-t
authored and
gitster
committed
b1b008f
odb/streaming: drop `is_finished` field

pks-t
authored and
gitster
committed
7267822
odb/streaming: support streaming arbitrary object types

pks-t
authored and
gitster
committed
8a51f6e
odb/streaming: rename `struct odb_read_stream`

pks-t
authored and
gitster
committed
a59e479
odb/streaming: consolidate read and write streams

pks-t
authored and
gitster
committed
e837b81
odb/streaming: rename `struct read_object_fd_data`

pks-t
authored and
gitster
committed
93dd246
odb/streaming: rename `struct input_zstream_data`

pks-t
authored and
gitster
committed
3f8290e
odb/streaming: unify function names to create new streams

pks-t
authored and
gitster
committed
ebdd7e1

Commits on Aug 8, 2026

t5701: use test_file_size() to get the size of a file

pabloosabaterr
authored and
gitster
committed
c3a8f43
fetch-object-info: detect malformed server responses

pabloosabaterr
authored and
gitster
committed
62e5104
fetch-object-info: pass arguments directly instead of a struct

pabloosabaterr
authored and
gitster
committed
d43b4d3
fetch-object-info: use dedicated struct for the results

pabloosabaterr
authored and
gitster
committed
c5c971d
fetch-object-info: die() on the remaining error path

pabloosabaterr
authored and
gitster
committed
50dd6d3
transport: drop remote object-info fields from transport struct

peff
authored and
gitster
committed
567e62b
protocol-caps: add type support to object-info

pabloosabaterr
authored and
gitster
committed
7692fa9
fetch-object-info: parse type from server response

pabloosabaterr
authored and
gitster
committed
afa4ea5
serve: advertise type capability

pabloosabaterr
authored and
gitster
committed
4c842de
cat-file: unify default format

pabloosabaterr
authored and
gitster
committed
245f2a8

Commits on Aug 10, 2026

send-email: clarify missing subject error

HaraldNordgren
authored and
gitster
committed
b0b304c

Commits on Aug 11, 2026

parse-options: introduce OPT_HIDDEN_GROUP

chriscool
authored and
gitster
committed
5ab204e
api-parse-options.adoc: document per-option flags

chriscool
authored and
gitster
committed
e455bad
api-parse-options.adoc: document hidden and OPT_*_F option macros

chriscool
authored and
gitster
committed
08b7e35
fast-import: localize 'i' into the 'for' loops using it

chriscool
authored and
gitster
committed
62c1a58
fast-import: use int for some bool flags

chriscool
authored and
gitster
committed
a895a37
fast-import: factor out option_*() functions

chriscool
authored and
gitster
committed
63112e7
fast-import: introduce 'struct fast_import_state'

chriscool
authored and
gitster
committed
417afb2
fast-import: move command state globals into 'struct fast_import_state'

chriscool
authored and
gitster
committed
ee996af
fast-import: use struct option for usage string

chriscool
authored and
gitster
committed
27ab581
fast-import: use callbacks to parse some options

chriscool
authored and
gitster
committed
87cf4d7
fast-import: use parse_options() for command line options

chriscool
authored and
gitster
committed
8639376
fast-import: remove useless from_stream argument

chriscool
authored and
gitster
committed
a09c2f2
Documentation/technical: add paint-down-to-common doc

spkrka
authored and
gitster
committed
cd2ab0e
test-lib-functions: improve diagnostic output for trace2 data assertions

spkrka
authored and
gitster
committed
fe4877b
t6600: add test cases for side-exhaustion edge cases

newren
authored and
gitster
committed
d3180b1
t6099: add side-exhaustion regression test

spkrka
authored and
gitster
committed
259a45f
commit-reach: add trace2 instrumentation to paint_down_to_common()

spkrka
authored and
gitster
committed
6300d71
t6600: add clock-skew topologies and step counts for edge cases

spkrka
authored and
gitster
committed
bad3793
commit-reach: introduce struct paint_state with per-side counters

spkrka
authored and
gitster
committed
a3e5bad
commit-reach: terminate merge-base walk when one paint side is exhausted

spkrka
authored and
gitster
committed
02d7ba0
commit-reach: move min_generation check into paint_queue_get()

spkrka
authored and
gitster
committed
4e08160
commit-reach: remove commit-date ordering fallback

spkrka
authored and
gitster
committed
56c9056

Commits on Aug 12, 2026

sequencer: release the ODB before spawning git commit

dscho
authored and
gitster
committed
65cda10

Commits on Aug 24, 2026

Merge branch 'ps/cat-file-remote-object-info-type'
gitster
committed
4b27b7c
Merge branch 'cc/fast-import-usage'
gitster
committed
10d3ea2
Merge branch 'ps/odb-streams'
gitster
committed
a2ef06b
Merge branch 'hn/send-email-missing-subject-error'
gitster
committed
6aab7b2
Merge branch 'js/sequencer-release-odb-before-commit'
gitster
committed
e8e7bf9
Merge branch 'kk/merge-base-exhaustion'
gitster
committed
679a72c
The 17th batch
gitster
committed
593c42f