[pull] master from git:master - #144

Merged

pull[bot] merged 23 commits into

turkdevops:masterfrom

Dec 22, 2025

Commits on Dec 11, 2025

odb: refactor parsing of alternates to be self-contained

pks-t
authored and
gitster
committed
1660496
odb: resolve relative alternative paths when parsing

pks-t
authored and
gitster
committed
84cec52
odb: move computation of normalized objdir into `alt_odb_usable()`

pks-t
authored and
gitster
committed
d17673e
odb: stop splitting alternate in `odb_add_to_alternates_file()`

pks-t
authored and
gitster
committed
dccfb39
odb: remove mutual recursion when parsing alternates

pks-t
authored and
gitster
committed
430e0e0
odb: drop forward declaration of `read_info_alternates()`

pks-t
authored and
gitster
committed
3f42555
odb: read alternates via sources

pks-t
authored and
gitster
committed
f7dbd9f
odb: write alternates via sources

pks-t
authored and
gitster
committed
221a877

Commits on Dec 12, 2025

Makefile: help macOS novices by mentioning MacPorts
gitster
committed
d4b7328
Merge branch 'sa/replay-atomic-ref-updates' into rs/replay-wrong-onto-fix
gitster
committed
8cb4a11
replay: move onto NULL check before first use

rscharfe
authored and
gitster
committed
a4a77e4
pull: move options[] array into function scope

jayatheerthkulkarni
authored and
gitster
committed
bab3917

Commits on Dec 14, 2025

t4014: support Git version strings with spaces

rscharfe
authored and
gitster
committed
007b899
doc: replay: mention no output on conflicts

LemmingAvalanche
authored and
gitster
committed
8467c95
replay: improve --contained and add to doc

LemmingAvalanche
authored and
gitster
committed
03d7c9c
doc: replay: link section using markup

LemmingAvalanche
authored and
gitster
committed
9ba08b3

Commits on Dec 22, 2025

Merge branch 'ps/odb-alternates-object-sources'
gitster
committed
5a8046a
Merge branch 'kh/doc-replay-updates'
gitster
committed
6a3051d
Merge branch 'rs/replay-wrong-onto-fix'
gitster
committed
24a51fe
Merge branch 'jc/macports-darwinports'
gitster
committed
4486734
Merge branch 'kj/pull-options-decl-cleanup'
gitster
committed
bcc20b8
Merge branch 'rs/t4014-git-version-string-fix'
gitster
committed
e722590
The 11th batch
gitster
committed
c8d76f7