Downmerge a handful of fixes for 2.37.x maintenance track
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jul 27, 2022 at 13:22 UTC
00d12607a27e387ad78b5957afa05e89c87e83a5
2 files changed
+48
-1
Documentation/RelNotes/2.37.2.txt
new
+47
@@ -0,0 +1,47 @@
1
+Git 2.37.2 Release Notes
2
+========================
3
+
4
+This primarily is to backport various fixes accumulated on the 'master'
5
+front since 2.37.1.
6
+
7
+Fixes since v2.37.1
8
+-------------------
9
+
10
+ * "git shortlog -n" relied on the underlying qsort() to be stable,
11
+ which shouldn't have. Fixed.
12
+
13
+ * Variable quoting fix in the vimdiff driver of "git mergetool".
14
+
15
+ * An earlier attempt to plug leaks placed a clean-up label to jump to
16
+ at a bogus place, which as been corrected.
17
+
18
+ * Fixes a long-standing corner case bug around directory renames in
19
+ the merge-ort strategy.
20
+
21
+ * Recent update to vimdiff layout code has been made more robust
22
+ against different end-user vim settings.
23
+
24
+ * In a non-bare repository, the behavior of Git when the
25
+ core.worktree configuration variable points at a directory that has
26
+ a repository as its subdirectory, regressed in Git 2.27 days.
27
+
28
+ * References to commands-to-be-typed-literally in "git rebase"
29
+ documentation mark-up have been corrected.
30
+
31
+ * Give _() markings to fatal/warning/usage: labels that are shown in
32
+ front of these messages.
33
+
34
+ * "git mktree --missing" lazily fetched objects that are missing from
35
+ the local object store, which was totally unnecessary for the purpose
36
+ of creating the tree object(s) from its input.
37
+
38
+ * Fixes for tests when the source directory has unusual characters in
39
+ its path, e.g. whitespaces, double-quotes, etc.
40
+
41
+ * Adjust technical/bitmap-format to be formatted by AsciiDoc, and
42
+ add some missing information to the documentation.
43
+
44
+ * Certain diff options are currently ignored when combined-diff is
45
+ shown; mark them as incompatible with the feature.
46
+
47
+Also contains minor documentation updates and code clean-ups.
RelNotes
+1
-1
@@ -1 +1 @@
1
-Documentation/RelNotes/2.37.1.txt
\ No newline at end of file
1
+Documentation/RelNotes/2.37.2.txt
\ No newline at end of file