Skip to content

Commit

Permalink
Sync with Git 2.48-rc1
Browse files Browse the repository at this point in the history
  • Loading branch information
gitster committed Dec 23, 2024
2 parents b75456b + f2cfb42 commit 73897bc
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
27 changes: 27 additions & 0 deletions Documentation/RelNotes/2.48.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ UI, Workflows & Features
* "git fetch" honors "remote.<remote>.followRemoteHEAD" settings to
tweak the remote-tracking HEAD in "refs/remotes/<remote>/HEAD".

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


Performance, Internal Implementation, Development Support etc.
--------------------------------------------------------------
Expand Down Expand Up @@ -141,6 +145,22 @@ Performance, Internal Implementation, Development Support etc.

* Build procedure update plus introduction of Meson based builds.

* Recent reftable updates mistook a NULL return from a request for
0-byte allocation as OOM and died unnecessarily, which has been
corrected.

* Reftable backend adds check for upper limit of log's update_index.

* Start working to make the codebase buildable with -Wsign-compare.

* Regression fix for 'show-index' when run outside of a repository.

* The meson-build procedure is integrated into CI to catch and
prevent bitrotting.

* "git refs migrate" learned to also migrate the reflog data across
backends.


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

* GitLab CI updates.
(merge c6b43f663e ps/ci-gitlab-update later to maint).

* Code to reuse objects based on bitmap contents have been tightened
to avoid race condition even when multiple packs are involved.
(merge 62b3ec8a3f tb/bitmap-fix-pack-reuse later to maint).

* Other code cleanup, docfix, build fix, etc.
(merge 77af53f56f aa/t7300-modernize later to maint).
(merge dcd590a39d bf/t-readme-mention-reftable later to maint).
Expand Down
2 changes: 1 addition & 1 deletion GIT-VERSION-GEN
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

DEF_VER=v2.48.0-rc0
DEF_VER=v2.48.0-rc1

LF='
'
Expand Down

0 comments on commit 73897bc

Please sign in to comment.