The third batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 15, 2021 at 09:40 UTC
69a9c10c95e28df457e33b3c7400b16caf2e2962
1 file changed
+65
Documentation/RelNotes/2.35.0.txt
+65
@@ -36,6 +36,14 @@ UI, Workflows & Features
36
option of commands from the "git log" family takes "human" and
37
"auto" as valid values.
38
39
+ * "Zealous diff3" style of merge conflict presentation has been added.
40
+
41
+ * The "git log --format=%(describe)" placeholder has been extended to
42
+ allow passing selected command-line options to the underlying "git
43
+ describe" command.
44
+
45
+ * "default" and "reset" have been added to our color palette.
46
+
47
48
Performance, Internal Implementation, Development Support etc.
49
@@ -63,6 +71,36 @@ Performance, Internal Implementation, Development Support etc.
71
* Weather balloon to break people with compilers that do not support
72
C99.
73
74
+ * The "reftable" backend for the refs API, without integrating into
75
+ the refs subsystem, has been added.
76
+
77
+ * More tests are marked as leak-free.
78
+
79
+ * The test framework learns to list unsatisfied test prerequisites,
80
+ and optionally error out when prerequisites that are expected to be
81
+ satisfied are not.
82
+
83
+ * The default setting for trace2 event nesting was too low to cause
84
+ test failures, which is worked around by bumping it up in the test
85
+ framework.
86
+
87
+ * Drop support for TravisCI and update test workflows at GitHub.
88
+
89
+ * Many tests that used to need GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
90
+ mechanism to force "git" to use 'master' as the default name for
91
+ the initial branch no longer need it; the use of the mechanism from
92
+ them have been removed.
93
+
94
+ * Allow running our tests while disabling fsync.
95
+
96
+ * Document the parameters given to the reflog entry iterator callback
97
+ functions.
98
+ (merge e6e94f34b2 jc/reflog-iterator-callback-doc later to maint).
99
+
100
+ * The test helper for refs subsystem learned to write bogus and/or
101
+ nonexistent object name to refs to simulate error situations we
102
+ want to test Git in.
103
+
104
105
Fixes since v2.34
106
-----------------
@@ -148,6 +186,30 @@ Fixes since v2.34
186
'noop', which has been corrected.
187
(merge cc9dcdee61 en/rebase-x-fix later to maint).
188
189
+ * When the "git push" command is killed while the receiving end is
190
+ trying to report what happened to the ref update proposals, the
191
+ latter used to die, due to SIGPIPE. The code now ignores SIGPIPE
192
+ to increase our chances to run the post-receive hook after it
193
+ happens.
194
+ (merge d34182b9e3 rj/receive-pack-avoid-sigpipe-during-status-reporting later to maint).
195
+
196
+ * "git worktree add" showed "Preparing worktree" message to the
197
+ standard output stream, but when it failed, the message from die()
198
+ went to the standard error stream. Depending on the order the
199
+ stdio streams are flushed at the program end, this resulted in
200
+ confusing output. It has been corrected by sending all the chatty
201
+ messages to the standard error stream.
202
+ (merge b50252484f es/worktree-chatty-to-stderr later to maint).
203
+
204
+ * Coding guideline document has been updated to clarify what goes to
205
+ standard error in our system.
206
+ (merge e258eb4800 es/doc-stdout-vs-stderr later to maint).
207
+
208
+ * The sparse-index/sparse-checkout feature had a bug in its use of
209
+ the matching code to determine which path is in or outside the
210
+ sparse checkout patterns.
211
+ (merge 8c5de0d265 ds/sparse-deep-pattern-checkout-fix later to maint).
212
+
213
* Other code cleanup, docfix, build fix, etc.
214
(merge 74db416c9c cw/protocol-v2-doc-fix later to maint).
215
(merge f9b2b6684d ja/doc-cleanup later to maint).
@@ -162,3 +224,6 @@ Fixes since v2.34
224
(merge 7d3fc7df70 jt/midx-doc-fix later to maint).
225
(merge 7b089120d9 hn/create-reflog-simplify later to maint).
226
(merge 9e12400da8 cb/mingw-gmtime-r later to maint).
227
+ (merge 0bf0de6cc7 tb/pack-revindex-on-disk-cleanup later to maint).
228
+ (merge 2c68f577fc ew/cbtree-remove-unused-and-broken-cb-unlink later to maint).
229
+ (merge eafd6e7e55 ab/die-with-bug later to maint).