]> git.ipfire.org Git - thirdparty/git.git/blob - Documentation/RelNotes/2.35.0.txt
Merge branch 'ma/header-dup-cleanup'
[thirdparty/git.git] / Documentation / RelNotes / 2.35.0.txt
1 Git 2.35 Release Notes
2 ======================
3
4 Updates since Git 2.34
5 ----------------------
6
7 Backward compatibility warts
8
9 * "_" is now treated as any other URL-valid characters in an URL when
10 matching the per-URL configuration variable names.
11
12 * The color palette used by "git grep" has been updated to match that
13 of GNU grep.
14
15
16 UI, Workflows & Features
17
18 * "git status --porcelain=v2" now show the number of stash entries
19 with --show-stash like the normal output does.
20
21 * "git stash" learned the "--staged" option to stash away what has
22 been added to the index (and nothing else).
23
24 * "git var GIT_DEFAULT_BRANCH" is a way to see what name is used for
25 the newly created branch if "git init" is run.
26
27 * Various operating modes of "git reset" have been made to work
28 better with the sparse index.
29
30 * "git submodule deinit" for a submodule whose .git metadata
31 directory is embedded in its working tree refused to work, until
32 the submodule gets converted to use the "absorbed" form where the
33 metadata directory is stored in superproject, and a gitfile at the
34 top-level of the working tree of the submodule points at it. The
35 command is taught to convert such submodules to the absorbed form
36 as needed.
37
38 * The completion script (in contrib/) learns that the "--date"
39 option of commands from the "git log" family takes "human" and
40 "auto" as valid values.
41
42 * "Zealous diff3" style of merge conflict presentation has been added.
43
44 * The "git log --format=%(describe)" placeholder has been extended to
45 allow passing selected command-line options to the underlying "git
46 describe" command.
47
48 * "default" and "reset" have been added to our color palette.
49
50 * The cryptographic signing using ssh keys can specify literal keys
51 for keytypes whose name do not begin with the "ssh-" prefix by
52 using the "key::" prefix mechanism (e.g. "key::ecdsa-sha2-nistp256").
53
54 * "git fetch" without the "--update-head-ok" option ought to protect
55 a checked out branch from getting updated, to prevent the working
56 tree that checks it out to go out of sync. The code was written
57 before the use of "git worktree" got widespread, and only checked
58 the branch that was checked out in the current worktree, which has
59 been updated.
60
61 * "git name-rev" has been tweaked to give output that is shorter and
62 easier to understand.
63
64 * "git apply" has been taught to ignore a message without a patch
65 with the "--allow-empty" option. It also learned to honor the
66 "--quiet" option given from the command line.
67
68 * The "init" and "set" subcommands in "git sparse-checkout" have been
69 unified for a better user experience and performance.
70
71 * Many git commands that deal with working tree files try to remove a
72 directory that becomes empty (i.e. "git switch" from a branch that
73 has the directory to another branch that does not would attempt
74 remove all files in the directory and the directory itself). This
75 drops users into an unfamiliar situation if the command was run in
76 a subdirectory that becomes subject to removal due to the command.
77 The commands have been taught to keep an empty directory if it is
78 the directory they were started in to avoid surprising users.
79
80 * "git am" learns "--empty=(stop|drop|keep)" option to tweak what is
81 done to a piece of e-mail without a patch in it.
82
83 * The default merge message prepared by "git merge" records the name
84 of the current branch; the name can be overridden with a new option
85 to allow users to pretend a merge is made on a different branch.
86
87 * The way "git p4" shows file sizes in its output has been updated to
88 use human-readable units.
89
90 * "git -c branch.autosetupmerge=inherit branch new old" makes "new"
91 to have the same upstream as the "old" branch, instead of marking
92 "old" itself as its upstream.
93
94
95 Performance, Internal Implementation, Development Support etc.
96
97 * The use of errno as a means to carry the nature of error in the ref
98 API implementation has been reworked and reduced.
99
100 * Teach and encourage first-time contributors to this project to
101 state the base commit when they submit their topic.
102
103 * The command line complation for "git send-email" options have been
104 tweaked to make it easier to keep it in sync with the command itself.
105
106 * Ensure that the sparseness of the in-core index matches the
107 index.sparse configuration specified by the repository immediately
108 after the on-disk index file is read.
109
110 * Code clean-up to eventually allow information on remotes defined
111 for an arbitrary repository to be read.
112
113 * Build optimization.
114
115 * Tighten code for testing pack-bitmap.
116
117 * Weather balloon to break people with compilers that do not support
118 C99.
119
120 * The "reftable" backend for the refs API, without integrating into
121 the refs subsystem, has been added.
122
123 * More tests are marked as leak-free.
124
125 * The test framework learns to list unsatisfied test prerequisites,
126 and optionally error out when prerequisites that are expected to be
127 satisfied are not.
128
129 * The default setting for trace2 event nesting was too low to cause
130 test failures, which is worked around by bumping it up in the test
131 framework.
132
133 * Drop support for TravisCI and update test workflows at GitHub.
134
135 * Many tests that used to need GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
136 mechanism to force "git" to use 'master' as the default name for
137 the initial branch no longer need it; the use of the mechanism from
138 them have been removed.
139
140 * Allow running our tests while disabling fsync.
141
142 * Document the parameters given to the reflog entry iterator callback
143 functions.
144 (merge e6e94f34b2 jc/reflog-iterator-callback-doc later to maint).
145
146 * The test helper for refs subsystem learned to write bogus and/or
147 nonexistent object name to refs to simulate error situations we
148 want to test Git in.
149
150 * "diff --histogram" optimization.
151
152 * Weather balloon to find compilers that do not grok variable
153 declaration in the for() loop.
154
155 * diff and blame commands have been taught to work better with sparse
156 index.
157
158 * The chainlint test script linter in the test suite has been updated.
159
160 * The DEVELOPER=yes build uses -std=gnu99 now.
161
162 * "git format-patch" uses a single rev_info instance and then exits.
163 Mark the structure with UNLEAK() macro to squelch leak sanitizer.
164
165 * New interface into the tmp-objdir API to help in-core use of the
166 quarantine feature.
167
168 * Broken &&-chains in the test scripts have been corrected.
169
170 * The RCS keyword substitution in "git p4" used to be done assuming
171 that the contents are UTF-8 text, which can trigger decoding
172 errors. We now treat the contents as a bytestring for robustness
173 and correctness.
174
175 * The conditions to choose different definitions of the FLEX_ARRAY
176 macro for vendor compilers has been simplified to make it easier to
177 maintain.
178
179 * Correctness and performance update to "diff --color-moved" feature.
180
181 * "git upload-pack" (the other side of "git fetch") used a 8kB buffer
182 but most of its payload came on 64kB "packets". The buffer size
183 has been enlarged so that such a packet fits.
184
185 * "git fetch" and "git pull" are now declared sparse-index clean.
186 Also "git ls-files" learns the "--sparse" option to help debugging.
187
188 * Similar message templates have been consolidated so that
189 translators need to work on fewer number of messages.
190
191
192 Fixes since v2.34
193 -----------------
194
195 * "git grep" looking in a blob that has non-UTF8 payload was
196 completely broken when linked with certain versions of PCREv2
197 library in the latest release.
198
199 * Other code cleanup, docfix, build fix, etc.
200
201 * "git pull" with any strategy when the other side is behind us
202 should succeed as it is a no-op, but doesn't.
203
204 * An earlier change in 2.34.0 caused JGit application (that abused
205 GIT_EDITOR mechanism when invoking "git config") to get stuck with
206 a SIGTTOU signal; it has been reverted.
207
208 * An earlier change that broke .gitignore matching has been reverted.
209
210 * Things like "git -c branch.sort=bogus branch new HEAD", i.e. the
211 operation modes of the "git branch" command that do not need the
212 sort key information, no longer errors out by seeing a bogus sort
213 key.
214 (merge 98e7ab6d42 jc/fix-ref-sorting-parse later to maint).
215
216 * The compatibility implementation for unsetenv(3) were written to
217 mimic ancient, non-POSIX, variant seen in an old glibc; it has been
218 changed to return an integer to match the more modern era.
219 (merge a38989bd5b jc/unsetenv-returns-an-int later to maint).
220
221 * The clean/smudge conversion code path has been prepared to better
222 work on platforms where ulong is narrower than size_t.
223 (merge 596b5e77c9 mc/clean-smudge-with-llp64 later to maint).
224
225 * Redact the path part of packfile URI that appears in the trace output.
226 (merge 0ba558ffb1 if/redact-packfile-uri later to maint).
227
228 * CI has been taught to catch some Unicode directional formatting
229 sequence that can be used in certain mischief.
230 (merge 0e7696c64d js/ci-no-directional-formatting later to maint).
231
232 * The "--date=format:<strftime>" gained a workaround for the lack of
233 system support for a non-local timezone to handle "%s" placeholder.
234 (merge 9b591b9403 jk/strbuf-addftime-seconds-since-epoch later to maint).
235
236 * The "merge" subcommand of "git jump" (in contrib/) silently ignored
237 pathspec and other parameters.
238 (merge 67ba13e5a4 jk/jump-merge-with-pathspec later to maint).
239
240 * The code to decode the length of packed object size has been
241 corrected.
242 (merge 34de5b8eac jt/pack-header-lshift-overflow later to maint).
243
244 * The advice message given by "git pull" when the user hasn't made a
245 choice between merge and rebase still said that the merge is the
246 default, which no longer is the case. This has been corrected.
247 (merge 71076d0edd ah/advice-pull-has-no-preference-between-rebase-and-merge later to maint).
248
249 * "git fetch", when received a bad packfile, can fail with SIGPIPE.
250 This wasn't wrong per-se, but we now detect the situation and fail
251 in a more predictable way.
252 (merge 2a4aed42ec jk/fetch-pack-avoid-sigpipe-to-index-pack later to maint).
253
254 * The function to cull a child process and determine the exit status
255 had two separate code paths for normal callers and callers in a
256 signal handler, and the latter did not yield correct value when the
257 child has caught a signal. The handling of the exit status has
258 been unified for these two code paths. An existing test with
259 flakiness has also been corrected.
260 (merge 5263e22cba jk/t7006-sigpipe-tests-fix later to maint).
261
262 * When a non-existent program is given as the pager, we tried to
263 reuse an uninitialized child_process structure and crashed, which
264 has been fixed.
265 (merge f917f57f40 em/missing-pager later to maint).
266
267 * The single-key-input mode in "git add -p" had some code to handle
268 keys that generate a sequence of input via ReadKey(), which did not
269 handle end-of-file correctly, which has been fixed.
270 (merge fc8a8126df cb/add-p-single-key-fix later to maint).
271
272 * "git rebase -x" added an unnecessary 'exec' instructions before
273 'noop', which has been corrected.
274 (merge cc9dcdee61 en/rebase-x-fix later to maint).
275
276 * When the "git push" command is killed while the receiving end is
277 trying to report what happened to the ref update proposals, the
278 latter used to die, due to SIGPIPE. The code now ignores SIGPIPE
279 to increase our chances to run the post-receive hook after it
280 happens.
281 (merge d34182b9e3 rj/receive-pack-avoid-sigpipe-during-status-reporting later to maint).
282
283 * "git worktree add" showed "Preparing worktree" message to the
284 standard output stream, but when it failed, the message from die()
285 went to the standard error stream. Depending on the order the
286 stdio streams are flushed at the program end, this resulted in
287 confusing output. It has been corrected by sending all the chatty
288 messages to the standard error stream.
289 (merge b50252484f es/worktree-chatty-to-stderr later to maint).
290
291 * Coding guideline document has been updated to clarify what goes to
292 standard error in our system.
293 (merge e258eb4800 es/doc-stdout-vs-stderr later to maint).
294
295 * The sparse-index/sparse-checkout feature had a bug in its use of
296 the matching code to determine which path is in or outside the
297 sparse checkout patterns.
298 (merge 8c5de0d265 ds/sparse-deep-pattern-checkout-fix later to maint).
299
300 * "git rebase -x" by mistake started exporting the GIT_DIR and
301 GIT_WORK_TREE environment variables when the command was rewritten
302 in C, which has been corrected.
303 (merge 434e0636db en/rebase-x-wo-git-dir-env later to maint).
304
305 * When "git log" implicitly enabled the "decoration" processing
306 without being explicitly asked with "--decorate" option, it failed
307 to read and honor the settings given by the "--decorate-refs"
308 option.
309
310 * "git fetch --set-upstream" did not check if there is a current
311 branch, leading to a segfault when it is run on a detached HEAD,
312 which has been corrected.
313 (merge 17baeaf82d ab/fetch-set-upstream-while-detached later to maint).
314
315 * Among some code paths that ask an yes/no question, only one place
316 gave a prompt that looked different from the others, which has been
317 updated to match what the others create.
318 (merge 0fc8ed154c km/help-prompt-fix later to maint).
319
320 * "git log --invert-grep --author=<name>" used to exclude commits
321 written by the given author, but now "--invert-grep" only affects
322 the matches made by the "--grep=<pattern>" option.
323 (merge 794c000267 rs/log-invert-grep-with-headers later to maint).
324
325 * "git grep --perl-regexp" failed to match UTF-8 characters with
326 wildcard when the pattern consists only of ASCII letters, which has
327 been corrected.
328 (merge 32e3e8bc55 rs/pcre2-utf later to maint).
329
330 * Certain sparse-checkout patterns that are valid in non-cone mode
331 led to segfault in cone mode, which has been corrected.
332
333 * Use of certain "git rev-list" options with "git fast-export"
334 created nonsense results (the worst two of which being "--reverse"
335 and "--invert-grep --grep=<foo>"). The use of "--first-parent" is
336 made to behave a bit more sensible than before.
337 (merge 726a228dfb ws/fast-export-with-revision-options later to maint).
338
339 * Perf tests were run with end-user's shell, but it has been
340 corrected to use the shell specified by $TEST_SHELL_PATH.
341 (merge 9ccab75608 ja/perf-use-specified-shell later to maint).
342
343 * Fix dependency rules to generate hook-list.h header file.
344 (merge d3fd1a6667 ab/makefile-hook-list-dependency-fix later to maint).
345
346 * "git stash" by default triggers its "push" action, but its
347 implementation also made "git stash -h" to show short help only for
348 "git stash push", which has been corrected.
349 (merge ca7990cea5 ab/do-not-limit-stash-help-to-push later to maint).
350
351 * "git apply --3way" bypasses the attempt to do a three-way
352 application in more cases to address the regression caused by the
353 recent change to use direct application as a fallback.
354 (merge 34d607032c jz/apply-3-corner-cases later to maint).
355
356 * Fix performance-releated bug in "git subtree" (in contrib/).
357 (merge 3ce8888fb4 jl/subtree-check-parents-argument-passing-fix later to maint).
358
359 * Extend the guidance to choose the base commit to build your work
360 on, and hint/nudge contributors to read others' changes.
361 (merge fdfae830f8 jc/doc-submitting-patches-choice-of-base later to maint).
362
363 * A corner case bug in the ort merge strategy has been corrected.
364 (merge d30126c20d en/merge-ort-renorm-with-rename-delete-conflict-fix later to maint).
365
366 * "git stash apply" forgot to attempt restoring untracked files when
367 it failed to restore changes to tracked ones.
368 (merge 71cade5a0b en/stash-df-fix later to maint).
369
370 * Other code cleanup, docfix, build fix, etc.
371 (merge 74db416c9c cw/protocol-v2-doc-fix later to maint).
372 (merge f9b2b6684d ja/doc-cleanup later to maint).
373 (merge 7d1b866778 jc/fix-first-object-walk later to maint).
374 (merge 538ac74604 js/trace2-avoid-recursive-errors later to maint).
375 (merge 152923b132 jk/t5319-midx-corruption-test-deflake later to maint).
376 (merge 9081a421a6 ab/checkout-branch-info-leakfix later to maint).
377 (merge 42c456ff81 rs/mergesort later to maint).
378 (merge ad506e6780 tl/midx-docfix later to maint).
379 (merge bf5b83fd8a hk/ci-checkwhitespace-commentfix later to maint).
380 (merge 49f1eb3b34 jk/refs-g11-workaround later to maint).
381 (merge 7d3fc7df70 jt/midx-doc-fix later to maint).
382 (merge 7b089120d9 hn/create-reflog-simplify later to maint).
383 (merge 9e12400da8 cb/mingw-gmtime-r later to maint).
384 (merge 0bf0de6cc7 tb/pack-revindex-on-disk-cleanup later to maint).
385 (merge 2c68f577fc ew/cbtree-remove-unused-and-broken-cb-unlink later to maint).
386 (merge eafd6e7e55 ab/die-with-bug later to maint).
387 (merge 91028f7659 jc/grep-patterntype-default-doc later to maint).
388 (merge 47ca93d071 ds/repack-fixlets later to maint).
389 (merge e6a9bc0c60 rs/t4202-invert-grep-test-fix later to maint).
390 (merge deb5407a42 gh/gpg-doc-markup-fix later to maint).
391 (merge 999bba3e0b rs/daemon-plug-leak later to maint).
392 (merge 786eb1ba39 js/l10n-mention-ngettext-early-in-readme later to maint).
393 (merge 2f12b31b74 ab/makefile-msgfmt-wo-stats later to maint).