Some regression fixes for 2.36

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

diff --git a/Documentation/RelNotes/2.37.0.txt b/Documentation/RelNotes/2.37.0.txt
new file mode 100644 (file)
index 0000000..3c961d9
--- /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 fdcebd2c58dbfb14caddd963697a7fd6883ee512..1d667699e1926de980806790e50dfc0610743aad 100755 (executable)
--- 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 81052262e0e43711f308ebc67a371def932cdccc..51144b6e83418a44108511632565ef053f8c7712 120000 (symlink)
--- 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