Skip to content

Commit 996f0c5

Browse files
committed
Hopefully the final batch before 2.48-rc1
Let's wait for git-gui, gitk, and possibly po/ and delay the tagging of the -rc1. Many people are already offline for the end-of-year holidays and it is a slow week, and 'master' front has too many new things graduated from 'next' a bit too early for me to feel comfortable. Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6f8ae95 commit 996f0c5

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

Documentation/RelNotes/2.48.0.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ UI, Workflows & Features
3535
* "git fetch" honors "remote.<remote>.followRemoteHEAD" settings to
3636
tweak the remote-tracking HEAD in "refs/remotes/<remote>/HEAD".
3737

38+
* "git range-diff" learned to optionally show and compare merge
39+
commits in the ranges being compared, with the --diff-merges
40+
option.
41+
3842

3943
Performance, Internal Implementation, Development Support etc.
4044
--------------------------------------------------------------
@@ -141,6 +145,22 @@ Performance, Internal Implementation, Development Support etc.
141145

142146
* Build procedure update plus introduction of Meson based builds.
143147

148+
* Recent reftable updates mistook a NULL return from a request for
149+
0-byte allocation as OOM and died unnecessarily, which has been
150+
corrected.
151+
152+
* Reftable backend adds check for upper limit of log's update_index.
153+
154+
* Start working to make the codebase buildable with -Wsign-compare.
155+
156+
* Regression fix for 'show-index' when run outside of a repository.
157+
158+
* The meson-build procedure is integrated into CI to catch and
159+
prevent bitrotting.
160+
161+
* "git refs migrate" learned to also migrate the reflog data across
162+
backends.
163+
144164

145165
Fixes since v2.47
146166
-----------------
@@ -280,6 +300,13 @@ Fixes since v2.47
280300
the revision walker, which has become unnecessary.
281301
(merge dd1072dfa8 tc/bundle-with-tag-remove-workaround later to maint).
282302

303+
* GitLab CI updates.
304+
(merge c6b43f663e ps/ci-gitlab-update later to maint).
305+
306+
* Code to reuse objects based on bitmap contents have been tightened
307+
to avoid race condition even when multiple packs are involved.
308+
(merge 62b3ec8a3f tb/bitmap-fix-pack-reuse later to maint).
309+
283310
* Other code cleanup, docfix, build fix, etc.
284311
(merge 77af53f56f aa/t7300-modernize later to maint).
285312
(merge dcd590a39d bf/t-readme-mention-reftable later to maint).

GIT-VERSION-GEN

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
DEF_VER=v2.48.0-rc0
3+
DEF_VER=v2.48.0-rc1
44

55
LF='
66
'

0 commit comments

Comments
 (0)