]>
Commit | Line | Data |
---|---|---|
745f6812 JH |
1 | Git 2.24 Release Notes |
2 | ====================== | |
3 | ||
4 | Updates since v2.23 | |
5 | ------------------- | |
6 | ||
7 | Backward compatibility note | |
8 | ||
bc12974a JH |
9 | * Although it is not officially deprecated, "filter-branch" is |
10 | showing its age and alternatives are available. From this release, | |
11 | we started to discourage its uses and hint people about | |
12 | filter-repo. | |
745f6812 JH |
13 | |
14 | UI, Workflows & Features | |
15 | ||
4c861400 JH |
16 | * We now have an active interim maintainer for the Git-Gui part of |
17 | the system. Praise and thank Pratyush Yadav for volunteering. | |
18 | ||
f1d4a282 JH |
19 | * The command line parser learned "--end-of-options" notation; the |
20 | standard convention for scripters to have hardcoded set of options | |
21 | first on the command line, and force the command to treat end-user | |
22 | input as non-options, has been to use "--" as the delimiter, but | |
23 | that would not work for commands that use "--" as a delimiter | |
24 | between revs and pathspec. | |
25 | ||
26 | * A mechanism to affect the default setting for a (related) group of | |
27 | configuration variables is introduced. | |
28 | ||
29 | * "git fetch" learned "--set-upstream" option to help those who first | |
30 | clone from their private fork they intend to push to, add the true | |
31 | upstream via "git remote add" and then "git fetch" from it. | |
32 | ||
33 | * Device-tree files learned their own userdiff patterns. | |
34 | (merge 3c81760bc6 sb/userdiff-dts later to maint). | |
745f6812 | 35 | |
4c861400 JH |
36 | * "git rebase --rebase-merges" learned to drive different merge |
37 | strategies and pass strategy specific options to them. | |
38 | ||
39 | * A new "pre-merge-commit" hook has been introduced. | |
40 | ||
41 | * Command line completion updates for "git -c var.name=val" have been | |
42 | added. | |
43 | ||
44 | * The lazy clone machinery has been taught that there can be more | |
45 | than one promisor remote and consult them in order when downloading | |
46 | missing objects on demand. | |
47 | ||
48 | * The list-objects-filter API (used to create a sparse/lazy clone) | |
49 | learned to take a combined filter specification. | |
50 | ||
bc12974a JH |
51 | * The documentation and tests for "git format-patch" have been |
52 | cleaned up. | |
53 | ||
54 | * On Windows, the root level of UNC share is now allowed to be used | |
55 | just like any other directory. | |
56 | ||
57 | * The command line completion support (in contrib/) learned about the | |
58 | "--skip" option of "git revert" and "git cherry-pick". | |
59 | ||
60 | * "git rebase --keep-base <upstream>" tries to find the original base | |
61 | of the topic being rebased and rebase on top of that same base, | |
62 | which is useful when running the "git rebase -i" (and its limited | |
63 | variant "git rebase -x"). | |
64 | ||
65 | The command also has learned to fast-forward in more cases where it | |
66 | can instead of replaying to recreate identical commits. | |
67 | ||
68 | * A configuration variable tells "git fetch" to write the commit | |
69 | graph after finishing. | |
70 | ||
08da6496 JH |
71 | * "git add -i" has been taught to show the total number of hunks and |
72 | the hunks that has been processed so far when showing prompts. | |
73 | ||
108b97dc JH |
74 | * "git fetch --jobs=<n>" allowed <n> parallel jobs when fetching |
75 | submodules, but this did not apply to "git fetch --multiple" that | |
76 | fetches from multiple remote repositories. It now does. | |
77 | ||
d81542e6 JH |
78 | * The installation instruction for zsh completion script (in |
79 | contrib/) has been a bit improved. | |
80 | ||
745f6812 JH |
81 | |
82 | Performance, Internal Implementation, Development Support etc. | |
83 | ||
84 | * The code to write commit-graph over given commit object names has | |
85 | been made a bit more robust. | |
86 | ||
87 | * The first line of verbose output from each test piece now carries | |
88 | the test name and number to help scanning with eyeballs. | |
89 | ||
f1d4a282 JH |
90 | * Further clean-up of the initialization code. |
91 | ||
4c861400 JH |
92 | * xmalloc() used to have a mechanism to ditch memory and address |
93 | space resources as the last resort upon seeing an allocation | |
94 | failure from the underlying malloc(), which made the code complex | |
95 | and thread-unsafe with dubious benefit, as major memory resource | |
96 | users already do limit their uses with various other mechanisms. | |
97 | It has been simplified away. | |
98 | ||
99 | * Unnecessary full-tree diff in "git log -L" machinery has been | |
100 | optimized away. | |
101 | ||
102 | * The http transport lacked some optimization the native transports | |
103 | learned to avoid unnecessary ref advertisement, which has been | |
104 | corrected. | |
105 | ||
bc12974a JH |
106 | * Preparation for SHA-256 upgrade continues in the test department. |
107 | (merge 0c37c41d13 bc/hash-independent-tests-part-5 later to maint). | |
108 | ||
109 | * The memory ownership model of the "git fast-import" got | |
110 | straightened out. | |
111 | ||
112 | * Output from trace2 subsystem is formatted more prettily now. | |
113 | ||
114 | * The internal code originally invented for ".gitignore" processing | |
115 | got reshuffled and renamed to make it less tied to "excluding" and | |
116 | stress more that it is about "matching", as it has been reused for | |
117 | things like sparse checkout specification that want to check if a | |
118 | path is "included". | |
119 | ||
b744c3af JH |
120 | * "git stash" learned to write refreshed index back to disk. |
121 | ||
122 | * Coccinelle checks are done on more source files than before now. | |
123 | ||
124 | * The cache-tree code has been taught to be less aggressive in | |
125 | attempting to see if a tree object it computed already exists in | |
126 | the repository. | |
127 | ||
128 | * The code to parse and use the commit-graph file has been made more | |
129 | robust against corrupted input. | |
130 | ||
131 | * The hg-to-git script (in contrib/) has been updated to work with | |
132 | Python 3. | |
133 | ||
134 | * Update the way build artifacts in t/helper/ directory are ignored. | |
bc12974a | 135 | |
08da6496 JH |
136 | * Preparation for SHA-256 upgrade continues. |
137 | ||
108b97dc JH |
138 | * "git log --graph" for an octopus merge is sometimes colored |
139 | incorrectly, which is demonstrated and documented but not yet | |
140 | fixed. | |
141 | ||
142 | * The trace2 output, when sending them to files in a designated | |
143 | directory, can populate the directory with too many files; a | |
144 | mechanism is introduced to set the maximum number of files and | |
145 | discard further logs when the maximum is reached. | |
146 | ||
147 | * We have adopted a Code-of-conduct document. | |
148 | (merge 3f9ef874a7 jk/coc later to maint). | |
149 | ||
745f6812 JH |
150 | |
151 | Fixes since v2.23 | |
152 | ----------------- | |
153 | ||
154 | * "git grep --recurse-submodules" that looks at the working tree | |
155 | files looked at the contents in the index in submodules, instead of | |
156 | files in the working tree. | |
157 | (merge 6a289d45c0 mt/grep-submodules-working-tree later to maint). | |
158 | ||
159 | * Codepaths to walk tree objects have been audited for integer | |
160 | overflows and hardened. | |
161 | (merge 5aa02f9868 jk/tree-walk-overflow later to maint). | |
162 | ||
163 | * "git pack-refs" can lose refs that are created while running, which | |
164 | is getting corrected. | |
165 | (merge a613d4f817 sc/pack-refs-deletion-racefix later to maint). | |
166 | ||
167 | * "git checkout" and "git restore" to re-populate the index from a | |
168 | tree-ish (typically HEAD) did not work correctly for a path that | |
169 | was removed and then added again with the intent-to-add bit, when | |
170 | the corresponding working tree file was empty. This has been | |
171 | corrected. | |
172 | ||
173 | * Compilation fix. | |
174 | (merge 70597e8386 rs/nedalloc-fixlets later to maint). | |
175 | ||
f1d4a282 JH |
176 | * "git gui" learned to call the clean-up procedure before exiting. |
177 | (merge 0d88f3d2c5 py/git-gui-do-quit later to maint). | |
178 | ||
179 | * We promoted the "indent heuristics" that decides where to split | |
180 | diff hunks from experimental to the default a few years ago, but | |
181 | some stale documentation still marked it as experimental, which has | |
182 | been corrected. | |
183 | (merge 64e5e1fba1 sg/diff-indent-heuristic-non-experimental later to maint). | |
184 | ||
185 | * Fix a mismerge that happened in 2.22 timeframe. | |
186 | (merge acb7da05ac en/checkout-mismerge-fix later to maint). | |
187 | ||
188 | * "git archive" recorded incorrect length in extended pax header in | |
189 | some corner cases, which has been corrected. | |
190 | (merge 71d41ff651 rs/pax-extended-header-length-fix later to maint). | |
191 | ||
192 | * On-demand object fetching in lazy clone incorrectly tried to fetch | |
193 | commits from submodule projects, while still working in the | |
194 | superproject, which has been corrected. | |
195 | (merge a63694f523 jt/diff-lazy-fetch-submodule-fix later to maint). | |
196 | ||
197 | * Prepare get_short_oid() codepath to be thread-safe. | |
198 | (merge 7cfcb16b0e rs/sort-oid-array-thread-safe later to maint). | |
199 | ||
200 | * "for-each-ref" and friends that show refs did not protect themselves | |
201 | against ancient tags that did not record tagger names when asked to | |
202 | show "%(taggername)", which have been corrected. | |
203 | (merge 8b3f33ef11 mp/for-each-ref-missing-name-or-email later to maint). | |
204 | ||
205 | * The "git am" based backend of "git rebase" ignored the result of | |
206 | updating ".gitattributes" done in one step when replaying | |
207 | subsequent steps. | |
208 | (merge 2c65d90f75 bc/reread-attributes-during-rebase later to maint). | |
209 | ||
4c861400 JH |
210 | * Tell cURL library to use the same malloc() implementation, with the |
211 | xmalloc() wrapper, as the rest of the system, for consistency. | |
212 | (merge 93b980e58f cb/curl-use-xmalloc later to maint). | |
213 | ||
bc12974a JH |
214 | * Build fix to adjust .gitignore to unignore a path that we started to track. |
215 | (merge aac6ff7b5b js/visual-studio later to maint). | |
216 | ||
217 | * A few implementation fixes in the notes API. | |
218 | (merge 60fe477a0b mh/notes-duplicate-entries later to maint). | |
219 | ||
220 | * Fix an earlier regression to "git push --all" which should have | |
221 | been forbidden when the target remote repository is set to be a | |
222 | mirror. | |
223 | (merge 8e4c8af058 tg/push-all-in-mirror-forbidden later to maint). | |
224 | ||
225 | * Fix an earlier regression in the test suite, which mistakenly | |
226 | stopped running HTTPD tests. | |
227 | (merge 3960290675 sg/git-test-boolean later to maint). | |
228 | ||
229 | * "git rebase --autostash <upstream> <branch>", when <branch> is | |
230 | different from the current branch, incorrectly moved the tip of the | |
231 | current branch, which has been corrected. | |
232 | (merge bf1e28e0ad bw/rebase-autostash-keep-current-branch later to maint). | |
233 | ||
c90b652a JH |
234 | * Update support for Asciidoctor documentation toolchain. |
235 | (merge 83b0b8953e ma/asciidoctor-refmiscinfo later to maint). | |
236 | ||
237 | * Start using DocBook 5 (instead of DocBook 4.5) as Asciidoctor 2.0 | |
238 | no longer works with the older one. | |
239 | (merge f6461b82b9 bc/doc-use-docbook-5 later to maint). | |
240 | ||
241 | * The markup used in user-manual has been updated to work better with | |
242 | asciidoctor. | |
243 | (merge c4d2f6143a ma/user-manual-markup-update later to maint). | |
244 | ||
245 | * Make sure the grep machinery does not abort when seeing a payload | |
246 | that is not UTF-8 even when JIT is not in use with PCRE1. | |
247 | (merge ad7c543e3b cb/skip-utf8-check-with-pcre1 later to maint). | |
248 | ||
b744c3af JH |
249 | * The name of the blob object that stores the filter specification |
250 | for sparse cloning/fetching was interpreted in a wrong place in the | |
251 | code, causing Git to abort. | |
252 | ||
253 | * "git log --decorate-refs-exclude=<pattern>" was incorrectly | |
254 | overruled when the "--simplify-by-decoration" option is used, which | |
255 | has been corrected. | |
256 | (merge 0cc7380d88 rs/simplify-by-deco-with-deco-refs-exclude later to maint). | |
257 | ||
258 | * The "upload-pack" (the counterpart of "git fetch") needs to disable | |
259 | commit-graph when responding to a shallow clone/fetch request, but | |
260 | the way this was done made Git panic, which has been corrected. | |
261 | ||
262 | * The object traversal machinery has been optimized not to load tree | |
263 | objects when we are only interested in commit history. | |
264 | (merge 72ed80c784 jk/list-objects-optim-wo-trees later to maint). | |
265 | ||
266 | * The object name parser for "Nth parent" syntax has been made more | |
267 | robust against integer overflows. | |
268 | (merge 59fa5f5a25 rs/nth-parent-parse later to maint). | |
269 | ||
270 | * The code used in following tags in "git fetch" has been optimized. | |
271 | (merge b7e2d8bca5 ms/fetch-follow-tag-optim later to maint). | |
272 | ||
273 | * Regression fix for progress output. | |
274 | (merge 2bb74b53a4 sg/progress-fix later to maint). | |
275 | ||
276 | * A bug in merge-recursive code that triggers when a branch with a | |
277 | symbolic link is merged with a branch that replaces it with a | |
278 | directory has been fixed. | |
279 | (merge 83e3ad3b12 jt/merge-recursive-symlink-is-not-a-dir-in-way later to maint). | |
280 | ||
70bf0b75 JH |
281 | * The rename detection logic sorts a list of rename source candidates |
282 | by similarity to pick the best candidate, which means that a tie | |
283 | between sources with the same similarity is broken by the original | |
284 | location in the original candidate list (which is sorted by path). | |
285 | Force the sorting by similarity done with a stable sort, which is | |
286 | not promised by system supplied qsort(3), to ensure consistent | |
287 | results across platforms. | |
288 | (merge 2049b8dc65 js/diff-rename-force-stable-sort later to maint). | |
289 | ||
290 | * The code to skip "UTF" and "UTF-" prefix, when computing an advice | |
291 | message, did not work correctly when the prefix was "UTF", which | |
292 | has been fixed. | |
293 | (merge b181676ce9 rs/convert-fix-utf-without-dash later to maint). | |
294 | ||
08da6496 JH |
295 | * The author names taken from SVN repositories may have extra leading |
296 | or trailing whitespaces, which are now munged away. | |
297 | (merge 4ddd4bddb1 tk/git-svn-trim-author-name later to maint). | |
298 | ||
299 | * "git rebase -i" showed a wrong HEAD while "reword" open the editor. | |
300 | (merge b0a3186140 pw/rebase-i-show-HEAD-to-reword later to maint). | |
301 | ||
302 | * A few simplification and bugfixes to PCRE interface. | |
303 | (merge c581e4a749 ab/pcre-jit-fixes later to maint). | |
304 | ||
305 | * PCRE fixes. | |
306 | (merge ff61681b46 cb/pcre1-cleanup later to maint). | |
307 | ||
308 | * "git range-diff" segfaulted when diff.noprefix configuration was | |
309 | used, as it blindly expected the patch it internally generates to | |
310 | have the standard a/ and b/ prefixes. The command now forces the | |
311 | internal patch to be built without any prefix, not to be affected | |
312 | by any end-user configuration. | |
313 | (merge 937b76ed49 js/range-diff-noprefix later to maint). | |
314 | ||
315 | * "git stash apply" in a subdirectory of a secondary worktree failed | |
316 | to access the worktree correctly, which has been corrected. | |
317 | (merge dfd557c978 js/stash-apply-in-secondary-worktree later to maint). | |
318 | ||
108b97dc JH |
319 | * The merge-recursive machiery is one of the most complex parts of |
320 | the system that accumulated cruft over time. This large series | |
321 | cleans up the implementation quite a bit. | |
322 | (merge b657047719 en/merge-recursive-cleanup later to maint). | |
323 | ||
324 | * Pretty-printed command line formatter (used in e.g. reporting the | |
325 | command being run by the tracing API) had a bug that lost an | |
326 | argument that is an empty string, which has been corrected. | |
327 | (merge ce2d7ed2fd gs/sq-quote-buf-pretty later to maint). | |
328 | ||
329 | * "git range-diff" failed to handle mode-only change, which has been | |
330 | corrected. | |
331 | (merge 2b6a9b13ca tg/range-diff-output-update later to maint). | |
332 | ||
d966095d JH |
333 | * Dev support update. |
334 | (merge 4f3c1dc5d6 dl/allow-running-cocci-verbosely later to maint). | |
335 | ||
336 | * "git format-patch -o <outdir>" did an equivalent of "mkdir <outdir>" | |
337 | not "mkdir -p <outdir>", which was corrected. | |
338 | ||
339 | * "git stash save" lost local changes to submodules, which has been | |
340 | corrected. | |
341 | (merge 556895d0c8 jj/stash-reset-only-toplevel later to maint). | |
342 | ||
d81542e6 JH |
343 | * The atomic push over smart HTTP transport did not work, which has |
344 | been corrected. | |
345 | (merge 6f1194246a bc/smart-http-atomic-push later to maint). | |
346 | ||
745f6812 JH |
347 | * Other code cleanup, docfix, build fix, etc. |
348 | (merge d1387d3895 en/fast-import-merge-doc later to maint). | |
f1d4a282 JH |
349 | (merge 1c24a54ea4 bm/repository-layout-typofix later to maint). |
350 | (merge 415b770b88 ds/midx-expire-repack later to maint). | |
351 | (merge 19800bdc3f nd/diff-parseopt later to maint). | |
352 | (merge 58166c2e9d tg/t0021-racefix later to maint). | |
bc12974a JH |
353 | (merge 7027f508c7 dl/compat-cleanup later to maint). |
354 | (merge e770fbfeff jc/test-cleanup later to maint). | |
355 | (merge 1fd881d404 rs/trace2-dst-warning later to maint). | |
356 | (merge 7e92756751 mh/http-urlmatch-cleanup later to maint). | |
357 | (merge 9784f97321 mh/release-commit-memory-fix later to maint). | |
358 | (merge 60d198d022 tb/banned-vsprintf-namefix later to maint). | |
359 | (merge 80e3658647 rs/help-unknown-ref-does-not-return later to maint). | |
360 | (merge 0a8bc7068f dt/remote-helper-doc-re-lock-option later to maint). | |
361 | (merge 27fd1e4ea7 en/merge-options-ff-and-friends later to maint). | |
362 | (merge 502c386ff9 sg/clean-nested-repo-with-ignored later to maint). | |
c90b652a | 363 | (merge 26e3d1cbea am/mailmap-andrey-mazo later to maint). |
b744c3af JH |
364 | (merge 47b27c96fa ss/get-time-cleanup later to maint). |
365 | (merge dd2e50a84e jk/commit-graph-cleanup later to maint). | |
366 | (merge 4fd39c76e6 cs/pretty-formats-doc-typofix later to maint). | |
367 | (merge 40e747e89d dl/submodule-set-branch later to maint). | |
368 | (merge 689a146c91 rs/commit-graph-use-list-count later to maint). | |
369 | (merge 0eb7c37a8a js/doc-patch-text later to maint). | |
370 | (merge 4b3aa170d1 rs/nth-switch-code-simplification later to maint). | |
371 | (merge 0d4304c124 ah/doc-submodule-ignore-submodules later to maint). | |
372 | (merge af78249463 cc/svn-fe-py-shebang later to maint). | |
373 | (merge 7bd97d6dff rs/alias-use-copy-array later to maint). | |
374 | (merge c46ebc2496 sg/travis-help-debug later to maint). | |
375 | (merge 24c681794f ps/my-first-contribution-alphasort later to maint). | |
376 | (merge 75b2c15435 cb/do-not-use-test-cmp-with-a later to maint). | |
377 | (merge cda0d497e3 bw/submodule-helper-usage-fix later to maint). | |
70bf0b75 JH |
378 | (merge fe0ed5d5e9 am/visual-studio-config-fix later to maint). |
379 | (merge 2e09c01232 sg/name-rev-cutoff-underflow-fix later to maint). | |
380 | (merge ddb3c856f3 as/shallow-slab-use-fix later to maint). | |
381 | (merge 71f4960b91 js/mingw-spawn-with-spaces-in-path later to maint). | |
382 | (merge 53d687bf5f ah/cleanups later to maint). | |
383 | (merge f537485fa5 rs/test-remove-useless-debugging-cat later to maint). | |
08da6496 | 384 | (merge 11a3d3aadd dl/rev-list-doc-cleanup later to maint). |
108b97dc JH |
385 | (merge d928a8388a am/t0028-utf16-tests later to maint). |
386 | (merge b05b40930e dl/t0000-skip-test-test later to maint). | |
387 | (merge 03d3b1297c js/xdiffi-comment-updates later to maint). | |
d966095d JH |
388 | (merge 57d8f4b4c7 js/doc-stash-save later to maint). |
389 | (merge 8c1cfd58e3 ta/t1308-typofix later to maint). | |
390 | (merge fa364ad790 bb/utf8-wcwidth-cleanup later to maint). | |
391 | (merge 68b69211b2 bb/compat-util-comment-fix later to maint). | |
392 | (merge 5cc6a4be11 rs/http-push-simplify later to maint). | |
393 | (merge a81e42d235 rs/column-use-utf8-strnwidth later to maint). | |
394 | (merge 062a309d36 rs/remote-curl-use-argv-array later to maint). | |
d81542e6 JH |
395 | (merge 3b3c79f6c9 nr/diff-highlight-indent-fix later to maint). |
396 | (merge 3444ec2eb2 wb/fsmonitor-bitmap-fix later to maint). | |
397 | (merge 10da030ab7 cb/pcre2-chartables-leakfix later to maint). | |
f21f8f5d JH |
398 | (merge 60e6569a12 js/mingw-needs-hiding-fix later to maint). |
399 | (merge 52bd3e4657 rl/gitweb-blame-prev-fix later to maint). |