summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-04-28 10:44:14 -0700
committerJunio C Hamano <gitster@pobox.com>2022-04-28 10:46:04 -0700
commit0f828332d5ac36fc63b7d8202652efa152809856 (patch)
tree1dbb9f788daa8f3f1a09556093cecfb6d86454a7
parent096b082b2abe55672242d4ac1e469c8843fee21c (diff)
downloadgit-0f828332d5ac36fc63b7d8202652efa152809856.tar.gz
Some regression fixes for 2.36
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.37.0.txt19
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 21 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.37.0.txt b/Documentation/RelNotes/2.37.0.txt
new file mode 100644
index 0000000000..3c961d96ae
--- /dev/null
+++ b/Documentation/RelNotes/2.37.0.txt
@@ -0,0 +1,19 @@
+Git v2.37 Release Notes
+=======================
+
+Fixes since v2.36
+-----------------
+
+ * "git submodule update" without pathspec should silently skip an
+ uninitialized submodule, but it started to become noisy by mistake.
+ (merge 4f1ccef87c gc/submodule-update-part2 later to maint).
+
+ * "diff-tree --stdin" has been broken for about a year, but 2.36
+ release broke it even worse by breaking running the command with
+ <pathspec>, which in turn broke "gitk" and got noticed. This has
+ been corrected by aligning its behaviour to that of "log".
+ (merge f8781bfda3 jc/diff-tree-stdin-fix later to maint).
+
+ * Regression fix for 2.36 where "git name-rev" started to sometimes
+ reference strings after they are freed.
+ (merge 45a14f578e rs/name-rev-fix-free-after-use later to maint).
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index fdcebd2c58..1d667699e1 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.36.0
+DEF_VER=v2.36.GIT
LF='
'
diff --git a/RelNotes b/RelNotes
index 81052262e0..51144b6e83 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.36.0.txt \ No newline at end of file
+Documentation/RelNotes/2.37.0.txt \ No newline at end of file