Git 2.47-rc1

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/2.47.0.txt b/Documentation/RelNotes/2.47.0.txt
index fbbea257a9bcc25dcd9e0618178d97bb712cac18..e13c37f5dd7a1cb015f5be6038bc4c59a7f0441c 100644 (file)
--- a/Documentation/RelNotes/2.47.0.txt
+++ b/Documentation/RelNotes/2.47.0.txt
@@ -162,6 +162,11 @@ Performance, Internal Implementation, Development Support etc.
  * Give timeout to the locking code to write to reftable, instead of
    failing on the first failure without retrying.
 
+ * The checksum at the tail of files are now computed without
+   collision detection protection.  This is safe as the consumer of
+   the information to protect itself from replay attacks checks for
+   hash collisions independently.
+
 
 Fixes since v2.46
 -----------------
@@ -317,6 +322,12 @@ Fixes since v2.46
    wasn't in any repository while processing includeIf.onbranch
    configuration and instead crashed.
 
+ * When "git sparse-checkout disable" turns a sparse checkout into a
+   regular checkout, the index is fully expanded.  This totally
+   expected behaviour however had an "oops, we are expanding the
+   index" advice message, which has been corrected.
+   (merge 537e516a39 ds/sparse-checkout-expansion-advice later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge be10ac7037 jc/mailinfo-header-cleanup later to maint).
    (merge 4460e052e0 jc/range-diff-lazy-setup later to maint).

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 38e920725c5f430d77c7cad43728ef4a365df6fc..1499ae59f6accbd540c8dedb977e9cf3205e6c22 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.47.0-rc0
+DEF_VER=v2.47.0-rc1
 
 LF='
 '