summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-09-13 19:18:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-09-13 19:22:59 (GMT)
commita0feb8611d4c0b2b5d954efe4e98207f62223436 (patch)
tree3c641c40a91be66b9a9a952affd200831bb876a4
parent2c75b3255b1d1f525c7c61b540b99af1ad84e8f8 (diff)
downloadgit-a0feb8611d4c0b2b5d954efe4e98207f62223436.zip
git-a0feb8611d4c0b2b5d954efe4e98207f62223436.tar.gz
git-a0feb8611d4c0b2b5d954efe4e98207f62223436.tar.bz2
Merge a handful of topics from the 'master' front
As the 'master' front will soon tag a preview and then release candidates for 2.38, it is unknown if we are going to issue another maintenance release on the 2.37.x track, but as we have accumulated enough material there, let's prepare a draft for it. Even if we end up not tagging 2.37.4, it would help motivated distro packagers to maintain their slightly older and "more stable" versions. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.37.4.txt31
l---------RelNotes2
2 files changed, 32 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.37.4.txt b/Documentation/RelNotes/2.37.4.txt
new file mode 100644
index 0000000..7321763
--- /dev/null
+++ b/Documentation/RelNotes/2.37.4.txt
@@ -0,0 +1,31 @@
+Git 2.37.4 Release Notes
+========================
+
+This primarily is to backport various fixes accumulated on the 'master'
+front since 2.37.3.
+
+Fixes since v2.37.3
+-------------------
+
+ * An earlier optimization discarded a tree-object buffer that is
+ still in use, which has been corrected.
+
+ * Fix deadlocks between main Git process and subprocess spawned via
+ the pipe_command() API, that can kill "git add -p" that was
+ reimplemented in C recently.
+
+ * xcalloc(), imitating calloc(), takes "number of elements of the
+ array", and "size of a single element", in this order. A call that
+ does not follow this ordering has been corrected.
+
+ * The preload-index codepath made copies of pathspec to give to
+ multiple threads, which were left leaked.
+
+ * Update the version of Ubuntu used for GitHub Actions CI from 18.04
+ to 22.04.
+
+ * The auto-stashed local changes created by "git merge --autostash"
+ was mixed into a conflicted state left in the working tree, which
+ has been corrected.
+
+Also contains other minor documentation updates and code clean-ups.
diff --git a/RelNotes b/RelNotes
index 6d88c2c..fcb45c8 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.37.3.txt \ No newline at end of file
+Documentation/RelNotes/2.37.4.txt \ No newline at end of file