summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-11-24 18:55:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-11-24 18:55:13 (GMT)
commite9d7761bb94f20acc98824275e317fa82436c25d (patch)
tree59717d8f5c3d55412d0f883f7f267a07893c834e
parentd62a7656fed27af65b1eb5c49501343696ad728a (diff)
downloadgit-maint.zip
git-maint.tar.gz
git-maint.tar.bz2
Git 2.34.1v2.34.1maint
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.34.1.txt23
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 25 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.34.1.txt b/Documentation/RelNotes/2.34.1.txt
new file mode 100644
index 0000000..ad404e9
--- /dev/null
+++ b/Documentation/RelNotes/2.34.1.txt
@@ -0,0 +1,23 @@
+Git v2.34.1 Release Notes
+=========================
+
+This release is primarily to fix a handful of regressions in Git 2.34.
+
+Fixes since v2.34
+-----------------
+
+ * "git grep" looking in a blob that has non-UTF8 payload was
+ completely broken when linked with certain versions of PCREv2
+ library in the latest release.
+
+ * "git pull" with any strategy when the other side is behind us
+ should succeed as it is a no-op, but doesn't.
+
+ * An earlier change in 2.34.0 caused JGit application (that abused
+ GIT_EDITOR mechanism when invoking "git config") to get stuck with
+ a SIGTTOU signal; it has been reverted.
+
+ * An earlier change that broke .gitignore matching has been reverted.
+
+ * SubmittingPatches document gained a syntactically incorrect mark-up,
+ which has been corrected.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 1ca3dfe..991308d 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.34.0
+DEF_VER=v2.34.1
LF='
'
diff --git a/RelNotes b/RelNotes
index 6c94469..30a5e48 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.34.0.txt \ No newline at end of file
+Documentation/RelNotes/2.34.1.txt \ No newline at end of file