Prepare for 2.46.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Aug 14, 2024 at 15:02 UTC
fa3b914457773d5a0bb02b382862dafd1c4c357e
3 files changed
+39
-2
Documentation/RelNotes/2.46.1.txt
new
+37
@@ -0,0 +1,37 @@
1
+Git 2.46.1 Release Notes
2
+========================
3
+
4
+This release is primarily to merge fixes accumulated on the 'master'
5
+front to prepare for 2.47 release that are still relevant to 2.46.x
6
+maintenance track.
7
+
8
+Fixes since Git 2.46
9
+--------------------
10
+
11
+ * "git checkout --ours" (no other arguments) complained that the
12
+ option is incompatible with branch switching, which is technically
13
+ correct, but found confusing by some users. It now says that the
14
+ user needs to give pathspec to specify what paths to checkout.
15
+
16
+ * It has been documented that we avoid "VAR=VAL shell_func" and why.
17
+
18
+ * "git add -p" by users with diff.suppressBlankEmpty set to true
19
+ failed to parse the patch that represents an unmodified empty line
20
+ with an empty line (not a line with a single space on it), which
21
+ has been corrected.
22
+
23
+ * "git rebase --help" referred to "offset" (the difference between
24
+ the location a change was taken from and the change gets replaced)
25
+ incorrectly and called it "fuzz", which has been corrected.
26
+
27
+ * "git notes add -m '' --allow-empty" and friends that take prepared
28
+ data to create notes should not invoke an editor, but it started
29
+ doing so since Git 2.42, which has been corrected.
30
+
31
+ * An expensive operation to prepare tracing was done in re-encoding
32
+ code path even when the tracing was not requested, which has been
33
+ corrected.
34
+
35
+ * Perforce tests have been updated.
36
+
37
+Also contains minor documentation updates and code clean-ups.
GIT-VERSION-GEN
+1
-1
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
3
GVF=GIT-VERSION-FILE
4
-DEF_VER=v2.46.0
4
+DEF_VER=v2.46.1-pre
5
6
LF='
7
'
RelNotes
+1
-1
@@ -1 +1 @@
1
-Documentation/RelNotes/2.46.0.txt
\ No newline at end of file
1
+Documentation/RelNotes/2.46.1.txt
\ No newline at end of file