A few hotfixes
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Nov 10, 2021 at 14:59 UTC
4d53e91c6b2c3f5b5c7375e579a453fc5053c08b
1 file changed
+20
-7
Documentation/RelNotes/2.34.0.txt
+20
-7
@@ -77,7 +77,10 @@ UI, Workflows & Features
77
* "git fsck" has been taught to report mismatch between expected and
78
actual types of an object better.
79
80
- * Use ssh public crypto for object and push-cert signing.
80
+ * In addition to GnuPG, ssh public crypto can be used for object and
81
+ push-cert signing. Note that this feature cannot be used with
82
+ ssh-keygen from OpenSSH 8.7, whose support for it is broken. Avoid
83
+ using it unless you update to OpenSSH 8.8.
84
85
* "git log --grep=string --author=name" learns to highlight hits just
86
like "git grep string" does.
@@ -182,7 +185,7 @@ Performance, Internal Implementation, Development Support etc.
185
* Prevent "make sparse" from running for the source files that
186
haven't been modified.
187
185
- * The codepath to write a new version of .midx multi-pack index files
188
+ * The code path to write a new version of .midx multi-pack index files
189
has learned to release the mmaped memory holding the current
190
version of .midx before removing them from the disk, as some
191
platforms do not allow removal of a file that still has mapping.
@@ -260,12 +263,8 @@ Fixes since v2.33
263
* The output from "git fast-export", when its anonymization feature
264
is in use, showed an annotated tag incorrectly.
265
263
- * Doc update plus improved error reporting.
264
-
266
* Recent "diff -m" changes broke "gitk", which has been corrected.
267
267
- * Regression fix.
268
-
268
* The "git apply -3" code path learned not to bother the lower level
269
merge machinery when the three-way merge can be trivially resolved
270
without the content level merge. This fixes a regression caused by
@@ -405,9 +404,23 @@ Fixes since v2.33
404
(merge 47bfdfb3fd ar/fix-git-pull-no-verify later to maint).
405
406
* One CI task based on Fedora image noticed a not-quite-kosher
408
- consturct recently, which has been corrected.
407
+ construct recently, which has been corrected.
408
(merge 4b540cf913 vd/pthread-setspecific-g11-fix later to maint).
409
410
+ * "git pull --ff-only" and "git pull --rebase --ff-only" should make
411
+ it a no-op to attempt pulling from a remote that is behind us, but
412
+ instead the command errored out by saying it was impossible to
413
+ fast-forward, which may technically be true, but not a useful thing
414
+ to diagnose as an error. This has been corrected.
415
+ (merge 361cb52383 jc/fix-pull-ff-only-when-already-up-to-date later to maint).
416
+
417
+ * The way Cygwin emulates a unix-domain socket, on top of which the
418
+ simple-ipc mechanism is implemented, can race with the program on
419
+ the other side that wants to use the socket, and briefly make it
420
+ appear as a regular file before lstat(2) starts reporting it as a
421
+ socket. We now have a workaround on the side that connects to a
422
+ unix domain socket.
423
+
424
* Other code cleanup, docfix, build fix, etc.
425
(merge f188160be9 ab/bundle-remove-verbose-option later to maint).
426
(merge 8c6b4332b4 rs/close-pack-leakfix later to maint).