@matheusbsbs / matheus-bagliano / commits / 6b8507d9f7

What's cooking (2021/07 #02)

Junio C Hamano committed Jul 8, 2021 at 14:04 UTC 6b8507d9f785944ecd79e80502ba3dce426b1faa
1 file changed +619 -734
whats-cooking.txt
+619 -734
@@ -1,27 +1,22 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Jul 2021, #01; Tue, 6)
4 -X-master-at: 670b81a890388c60b7032a4f5b879f2ece8c4558
5 -X-next-at: 7674896d58f7c91447ddcd64037ff660f9387632
3 +Subject: What's cooking in git.git (Jul 2021, #02; Thu, 8)
4 +X-master-at: d486ca60a51c9cb1fe068803c3f540724e95e83a
5 +X-next-at: 085311d9fa98621e847267e9cea4a891cc4ca32e
6
7 -What's cooking in git.git (Jul 2021, #01; Tue, 6)
7 +What's cooking in git.git (Jul 2021, #02; Thu, 8)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking in my tree. Commits
11 -prefixed with '-' are only in 'seen' while commits prefixed with '+'
12 -are in 'next'. The ones marked with '.' do not appear in any of the
13 -integration branches, but I am still holding onto them. Generally,
14 -being in 'next' is a sign that a topic is stable enough to be used
15 -and are candidate to be in a future release, while being in 'seen'
16 -means nothing more than that the maintainer has found it interesting
17 -for some reason (like "it may have hard-to-resolve conflicts with
11 +prefixed with '+' are in 'next' (being in 'next' is a sign that a
12 +topic is stable enough to be used and are candidate to be in a
13 +future release). Commits prefixed with '-' are only in 'seen',
14 +which means nothing more than that I have found them of interest for
15 +some reason (like "it may have hard-to-resolve conflicts with
16 another topic already in flight" or "this may turn out to be
19 -useful")---do not read too much into a topic being in (or not in)
20 -'seen'.
21 -
22 -Among those that are in 'seen', I haven't summarized many of them in
23 -this issue of report (let alone decided what to do with them). Help
24 -and patience is greatly appreciated.
17 +useful"). Do not read too much into a topic being in (or not in)
18 +'seen'. The ones marked with '.' do not appear in any of the
19 +integration branches, but I am still holding onto them.
20
21 Copies of the source code to Git live in many repositories, and the
22 following is a list of the ones I push into or their mirrors. Some
@@ -49,10 +44,369 @@ pages):
44
45 Release tarballs are available at:
46
52 - https://www.kernel.org/pub/software/scm/git/
47 + https://www.kernel.org/pub/software/scm/git/
48 +
49 +--------------------------------------------------
50 +[Graduated to 'master']
51 +
52 +* ab/cmd-foo-should-return (2021-06-09) 1 commit
53 + (merged to 'next' on 2021-07-02 at 4f91c90007)
54 + + builtins + test helpers: use return instead of exit() in cmd_*
55 +
56 + Code clean-up.
57 +
58 +
59 +* ab/config-hooks-path-testfix (2021-06-16) 1 commit
60 + (merged to 'next' on 2021-07-01 at 2ab6dbe8af)
61 + + pre-commit hook tests: don't leave "actual" nonexisting on failure
62 +
63 + Test fix.
64 +
65 +
66 +* ab/fix-columns-to-80-during-tests (2021-06-29) 1 commit
67 + (merged to 'next' on 2021-07-01 at e8cbef661b)
68 + + test-lib.sh: set COLUMNS=80 for --verbose repeatability
69 +
70 + Output from some of our tests were affected by the width of the
71 + terminal that they were run in, which has been corrected by
72 + exporting a fixed value in the COLUMNS environment.
73 +
74 +
75 +* ab/progress-cleanup (2021-06-08) 1 commit
76 + (merged to 'next' on 2021-07-02 at 288570c95a)
77 + + read-cache.c: don't guard calls to progress.c API
78 +
79 + Code clean-up.
80 +
81 +
82 +* ab/xdiff-bug-cleanup (2021-06-08) 1 commit
83 + (merged to 'next' on 2021-07-02 at f4920ba6d1)
84 + + xdiff: use BUG(...), not xdl_bug(...)
85 +
86 + Code clean-up.
87 +
88 +
89 +* ah/graph-typofix (2021-06-15) 1 commit
90 + (merged to 'next' on 2021-07-01 at c71fb8cbcb)
91 + + graph: improve grammar of "invalid color" error message
92 +
93 + Typofix in an error message.
94 +
95 +
96 +* ah/uninitialized-reads-fix (2021-06-15) 3 commits
97 + (merged to 'next' on 2021-07-01 at 61a967c340)
98 + + builtin/checkout--worker: zero-initialise struct to avoid MSAN complaints
99 + + split-index: use oideq instead of memcmp to compare object_id's
100 + + bulk-checkin: make buffer reuse more obvious and safer
101 +
102 + Make the codebase MSAN clean.
103 +
104 +
105 +* ar/doc-libera-chat-in-my-first-contrib (2021-06-09) 1 commit
106 + (merged to 'next' on 2021-07-02 at a0e3a1f5f2)
107 + + MyFirstContribution: link #git-devel to Libera Chat
108 +
109 + Update MyFirst document.
110 +
111 +
112 +* ar/mailinfo-memcmp-to-skip-prefix (2021-06-09) 1 commit
113 + (merged to 'next' on 2021-07-02 at e5122960c0)
114 + + mailinfo: use starts_with() when checking scissors
115 +
116 + Code clean-up.
117 +
118 +
119 +* ar/more-typofix (2021-06-28) 3 commits
120 + (merged to 'next' on 2021-07-01 at 02ca61ee96)
121 + + git-worktree.txt: fix typo in example path
122 + + t: fix typos in test messages
123 + + blame: correct name of config option in docs
124 +
125 + Typofixes.
126 +
127 +
128 +* ar/test-code-cleanup (2021-06-08) 1 commit
129 + (merged to 'next' on 2021-07-02 at 12d23f8a42)
130 + + t: fix whitespace around &&
131 +
132 + Test code clean-up.
133 +
134 +
135 +* ar/typofix (2021-06-14) 1 commit
136 + (merged to 'next' on 2021-07-01 at 8d10d6d568)
137 + + *: fix typos which duplicate a word
138 +
139 + Typofixes.
140 +
141 +
142 +* ba/object-info (2021-06-08) 1 commit
143 + (merged to 'next' on 2021-07-02 at c7fb4f900e)
144 + + protocol-caps.h: add newline at end of file
145 +
146 + Code clean-up.
147 +
148 +
149 +* dd/document-log-decorate-default (2021-06-08) 1 commit
150 + (merged to 'next' on 2021-07-02 at 529d71a690)
151 + + doc/log: correct default for --decorate
152 +
153 + Doc clean-up.
154 +
155 +
156 +* dd/svn-test-wo-locale-a (2021-06-08) 1 commit
157 + (merged to 'next' on 2021-07-01 at 9fa432af22)
158 + + t: use user-specified utf-8 locale for testing svn
159 +
160 + "git-svn" tests assumed that "locale -a", which is used to pick an
161 + available UTF-8 locale, is available everywhere. A knob has been
162 + introduced to allow testers to specify a suitable locale to use.
163 +
164 +
165 +* fc/doc-default-to-upstream-config (2021-06-08) 1 commit
166 + (merged to 'next' on 2021-07-01 at 3ce7d14f26)
167 + + doc: merge: mention default of defaulttoupstream
168 +
169 + Doc clean-up.
170 +
171 +
172 +* fc/pull-cleanups (2021-06-19) 3 commits
173 + (merged to 'next' on 2021-07-01 at f8d7a3fc78)
174 + + pull: trivial whitespace style fix
175 + + pull: trivial cleanup
176 + + pull: cleanup autostash check
177 +
178 + Code cleanup.
179 +
180 +
181 +* fw/complete-cmd-idx-fix (2021-06-19) 1 commit
182 + (merged to 'next' on 2021-07-01 at f16784c4cb)
183 + + completion: bash: fix late declaration of __git_cmd_idx
184 +
185 + Recent update to completion script (in contrib/) broke those who
186 + use the __git_complete helper to define completion to their custom
187 + command.
188 +
189 +
190 +* jk/bitmap-tree-optim (2021-06-15) 1 commit
191 + (merged to 'next' on 2021-07-01 at 2e0f108bb6)
192 + + bitmaps: don't recurse into trees already in the bitmap
193 +
194 + Avoid duplicated work while building reachability bitmaps.
195 +
196 +
197 +* jk/doc-max-pack-size (2021-06-09) 1 commit
198 + (merged to 'next' on 2021-07-02 at b272fddb22)
199 + + doc: warn people against --max-pack-size
200 +
201 + Doc update.
202 +
203 +
204 +* jk/revision-squelch-gcc-warning (2021-06-11) 1 commit
205 + (merged to 'next' on 2021-07-01 at 28f4da3e7d)
206 + + add_pending_object_with_path(): work around "gcc -O3" complaint
207 +
208 + Warning fix.
209 +
210 +
211 +* jk/test-avoid-globmatch-with-skip-patterns (2021-07-01) 1 commit
212 + (merged to 'next' on 2021-07-01 at 139fa916d1)
213 + + test-lib: avoid accidental globbing in match_pattern_list()
214 +
215 + We broke "GIT_SKIP_TESTS=t?000" to skip certain tests in recent
216 + update, which got fixed.
217 +
218 +
219 +* jk/test-without-readlink-1 (2021-06-19) 1 commit
220 + (merged to 'next' on 2021-07-01 at fb3bf5a6b0)
221 + + t: use portable wrapper for readlink(1)
222 +
223 + Some test scripts assumed that readlink(1) was universally
224 + installed and available, which is not the case.
225 +
226 +
227 +* js/no-more-multimail (2021-06-11) 1 commit
228 + (merged to 'next' on 2021-07-01 at ed7a4efc75)
229 + + multimail: stop shipping a copy
230 +
231 + Remove multimail from contrib/
232 +
233 +
234 +* js/stop-exporting-bogus-columns (2021-06-28) 1 commit
235 + (merged to 'next' on 2021-07-02 at 7674896d58)
236 + + pager: avoid setting COLUMNS when we're guessing its value
237 +
238 + When we cannot figure out how wide the terminal is, we use a
239 + fallback value of 80 ourselves (which cannot be avoided), but when
240 + we run the pager, we export it in COLUMNS, which forces the pager
241 + to use the hardcoded value, even when the pager is perfectly
242 + capable to figure it out itself. Stop exporting COLUMNS when we
243 + fall back on the hardcoded default value for our own use.
244 +
245 +
246 +* js/subtree-on-windows-fix (2021-06-15) 2 commits
247 + (merged to 'next' on 2021-07-01 at d4e4ccde63)
248 + + subtree: fix assumption about the directory separator
249 + + subtree: fix the GIT_EXEC_PATH sanity check to work on Windows
250 +
251 + Update "git subtree" to work better on Windows.
252 +
253 +
254 +* js/trace2-discard-event-docfix (2021-06-04) 1 commit
255 + (merged to 'next' on 2021-07-01 at 9fc3c6285e)
256 + + docs: fix api-trace2 doc for "too_many_files" event
257 +
258 + Docfix.
259 +
260 +
261 +* jv/userdiff-csharp-update (2021-06-16) 1 commit
262 + (merged to 'next' on 2021-07-01 at a2371d0580)
263 + + userdiff: add support for C# record types
264 +
265 + The userdiff pattern for C# learned the token "record".
266 +
267 +
268 +* jx/sideband-cleanup (2021-06-17) 4 commits
269 + (merged to 'next' on 2021-07-01 at 0eb604e8c2)
270 + + test: refactor to use "get_abbrev_oid" to get abbrev oid
271 + + test: refactor to use "test_commit" to create commits
272 + + test: compare raw output, not mangle tabs and spaces
273 + + sideband: don't lose clear-to-eol at packet boundary
274 +
275 + The side-band demultiplexer that is used to display progress output
276 + from the remote end did not clear the line properly when the end of
277 + line hits at a packet boundary, which has been corrected. Also
278 + comes with test clean-ups.
279 +
280 +
281 +* jx/t6020-with-older-bash (2021-06-17) 1 commit
282 + (merged to 'next' on 2021-07-01 at 55d71ed779)
283 + + t6020: fix incompatible parameter expansion
284 +
285 + Work around inefficient glob substitution in older versions of bash
286 + by rewriting parts of a test.
287 +
288 +
289 +* ms/mergetools-kdiff3-on-windows (2021-06-08) 1 commit
290 + (merged to 'next' on 2021-07-02 at 5ca2515f34)
291 + + mergetools/kdiff3: make kdiff3 work on Windows too
292 +
293 + On Windows, mergetool has been taught to find kdiff3.exe just like
294 + it finds winmerge.exe.
295 +
296 +
297 +* tb/complete-diff-anchored (2021-05-31) 1 commit
298 + (merged to 'next' on 2021-07-01 at 19878daaa9)
299 + + completion: add --anchored to diff's options
300 +
301 + The command line completion (in contrib/) learned that "git diff"
302 + takes the "--anchored" option.
303 +
304 +
305 +* tk/partial-clone-repack-doc (2021-06-04) 1 commit
306 + (merged to 'next' on 2021-07-01 at fe4c6280bc)
307 + + Remove warning that repack only works on non-promisor packfiles
308 +
309 + Docfix.
310 +
311 +--------------------------------------------------
312 +[New Topics]
313 +
314 +* ab/gitignore-discovery-doc (2021-07-06) 1 commit
315 + - docs: .gitignore parsing is to the top of the repo
316 +
317 + Doc update.
318 +
319 + Will merge to 'next'.
320 +
321 +
322 +* bc/rev-list-without-commit-line (2021-07-06) 1 commit
323 + - rev-list: add option for --pretty without header
324 +
325 + "git rev-list" learns to omit the "commit <object-name>" header
326 + lines from the output with the `--no-commit-header` option.
327 +
328 + Will merge to 'next'.
329 +
330 +
331 +* ab/imap-send-read-everything-simplify (2021-07-07) 1 commit
332 + - imap-send.c: use less verbose strbuf_fread() idiom
333 +
334 + Code simplification.
335 +
336 + Will merge to 'next'.
337 +
338 +
339 +* ab/pkt-line-tests (2021-07-07) 5 commits
340 + - test-lib-functions.sh: remove unused [de]packetize() functions
341 + - tests: replace remaining packetize() with "test-tool pkt-line"
342 + - tests: replace [de]packetize() shell+perl test-tool pkt-line
343 + - serve tests: use test_cmp in "protocol violations" test
344 + - serve tests: add missing "extra delim" test
345 +
346 + Update tests to cover a bit more protocol bits and unify two
347 + similar test helpers into one.
348 +
349 + Will merge to 'next'.
350 +
351 +
352 +--------------------------------------------------
353 +[Stalled]
354 +
355 +* hn/reftable (2021-05-20) 27 commits
356 + . t1404: annotate test cases with REFFILES
357 + . t1401,t2011: parameterize HEAD.lock for REFTABLE
358 + . t1301: document what needs to be done for REFTABLE
359 + . Add "test-tool dump-reftable" command.
360 + . git-prompt: prepare for reftable refs backend
361 + . Reftable support for git-core
362 + . reftable: add dump utility
363 + . reftable: implement stack, a mutable database of reftable files.
364 + . reftable: implement refname validation
365 + . reftable: add merged table view
366 + . reftable: add a heap-based priority queue for reftable records
367 + . reftable: reftable file level tests
368 + . reftable: read reftable files
369 + . reftable: generic interface to tables
370 + . reftable: write reftable files
371 + . reftable: a generic binary tree implementation
372 + . reftable: reading/writing blocks
373 + . Provide zlib's uncompress2 from compat/zlib-compat.c
374 + . reftable: (de)serialization for the polymorphic record type.
375 + . reftable: add blocksource, an abstraction for random access reads
376 + . reftable: utility functions
377 + . reftable: add error related functionality
378 + . reftable: add LICENSE
379 + . init-db: set the_repository->hash_algo early on
380 + . hash.h: provide constants for the hash IDs
381 + . refs/debug: trace into reflog expiry too
382 + . refs: document reflog_expire_fn's flag argument
383 + (this branch uses hn/refs-iterator-peel-returns-boolean.)
384 +
385 + The "reftable" backend for the refs API.
386 +
387 +
388 +* ao/p4-avoid-decoding (2021-04-12) 2 commits
389 + - git-p4: do not decode data from perforce by default
390 + - git-p4: avoid decoding more data from perforce
391 +
392 + "git p4" in Python-2 days used to accept a lot more kinds of data
393 + from Perforce server as uninterrupted byte sequence, but after
394 + switching to Python-3, too many things are expected to be in UTF-8,
395 + which broke traditional use cases.
396 +
397 + Waiting for reviews.
398 +
399 +
400 +* tv/p4-fallback-encoding (2021-04-30) 1 commit
401 + - git-p4: git-p4.fallbackEncoding to specify non UTF-8 charset
402 +
403 + "git p4" learns the fallbackEncoding configuration variable to
404 + safely accept changeset descriptions that aren't written in UTF-8.
405 +
406 + Waiting for reviews.
407
408 --------------------------------------------------
55 -[New Topics]
409 +[Cooking]
410
411 * ab/lib-subtest (2021-07-01) 8 commits
412 - test-lib tests: assert 1 exit code, not non-zero
@@ -66,7 +420,7 @@ Release tarballs are available at:
420
421 Refactor tests on test framework.
422
69 - WHat's the review status of this thing?
423 + What's the review status of this thing?
424
425
426 * ab/struct-init (2021-07-01) 5 commits
@@ -86,7 +440,8 @@ Release tarballs are available at:
440
441 Usability update for inactive submodules.
442
89 - Will merge to 'next'.
443 + Under review.
444 + cf. <fc5ec100-1d42-4199-236e-7a99c9218f38@gmail.com>
445
446
447 * en/ort-perf-batch-14 (2021-07-01) 7 commits
@@ -100,13 +455,15 @@ Release tarballs are available at:
455
456 Further optimization on "merge -sort" backend.
457
458 + Reviews?
459 +
460
461 * ar/help-micro-cleanup (2021-07-06) 1 commit
462 - help: convert git_cmd to page in one place
463
464 Tiny code clean-up.
465
109 - Will merge to 'next.
466 + Will merge to 'next'.
467
468
469 * ar/submodule-helper-include-cleanup (2021-07-06) 1 commit
@@ -137,12 +494,13 @@ Release tarballs are available at:
494
495
496 * hn/refs-iterator-peel-returns-boolean (2021-05-20) 1 commit
140 - - refs: make explicit that ref_iterator_peel returns boolean
497 + (merged to 'next' on 2021-07-08 at b9b35881ba)
498 + + refs: make explicit that ref_iterator_peel returns boolean
499 (this branch is used by hn/reftable.)
500
501 Tiny API tweak.
502
145 - Will merge to 'next'.
503 + Will merge to 'master'.
504
505
506 * hn/refs-test-cleanup (2021-07-06) 2 commits
@@ -170,117 +528,17 @@ Release tarballs are available at:
528 Will merge to 'next'.
529
530
173 -* sm/worktree-add-lock (2021-07-06) 1 commit
531 +* sm/worktree-add-lock (2021-07-08) 3 commits
532 - worktree: teach `add` to accept --reason <string> with --lock
533 + - worktree: default lock string should be marked with `_()` for translation
534 + - t2400: remove unneeded `git rev-parse` from '"add" worktree with lock' test
535
536 "git worktree add --lock" learned to record why the worktree is
537 locked with a custom message.
538
179 - Expecting a reroll.
180 -
181 ---------------------------------------------------
182 -[Stalled]
183 -
184 -* hn/reftable (2021-05-20) 27 commits
185 - . t1404: annotate test cases with REFFILES
186 - . t1401,t2011: parameterize HEAD.lock for REFTABLE
187 - . t1301: document what needs to be done for REFTABLE
188 - . Add "test-tool dump-reftable" command.
189 - . git-prompt: prepare for reftable refs backend
190 - . Reftable support for git-core
191 - . reftable: add dump utility
192 - . reftable: implement stack, a mutable database of reftable files.
193 - . reftable: implement refname validation
194 - . reftable: add merged table view
195 - . reftable: add a heap-based priority queue for reftable records
196 - . reftable: reftable file level tests
197 - . reftable: read reftable files
198 - . reftable: generic interface to tables
199 - . reftable: write reftable files
200 - . reftable: a generic binary tree implementation
201 - . reftable: reading/writing blocks
202 - . Provide zlib's uncompress2 from compat/zlib-compat.c
203 - . reftable: (de)serialization for the polymorphic record type.
204 - . reftable: add blocksource, an abstraction for random access reads
205 - . reftable: utility functions
206 - . reftable: add error related functionality
207 - . reftable: add LICENSE
208 - . init-db: set the_repository->hash_algo early on
209 - . hash.h: provide constants for the hash IDs
210 - . refs/debug: trace into reflog expiry too
211 - . refs: document reflog_expire_fn's flag argument
212 - (this branch uses hn/refs-iterator-peel-returns-boolean.)
213 -
214 - The "reftable" backend for the refs API.
215 -
216 -
217 -* ao/p4-avoid-decoding (2021-04-12) 2 commits
218 - - git-p4: do not decode data from perforce by default
219 - - git-p4: avoid decoding more data from perforce
220 -
221 - "git p4" in Python-2 days used to accept a lot more kinds of data
222 - from Perforce server as uninterrupted byte sequence, but after
223 - switching to Python-3, too many things are expected to be in UTF-8,
224 - which broke traditional use cases.
225 -
226 - Waiting for reviews.
227 -
228 -
229 -* tv/p4-fallback-encoding (2021-04-30) 1 commit
230 - - git-p4: git-p4.fallbackEncoding to specify non UTF-8 charset
231 -
232 - "git p4" learns the fallbackEncoding configuration variable to
233 - safely accept changeset descriptions that aren't written in UTF-8.
234 -
235 - Waiting for reviews.
236 -
237 ---------------------------------------------------
238 -[Cooking]
239 -
240 -* fw/complete-cmd-idx-fix (2021-06-19) 1 commit
241 - (merged to 'next' on 2021-07-01 at f16784c4cb)
242 - + completion: bash: fix late declaration of __git_cmd_idx
243 -
244 - Recent update to completion script (in contrib/) broke those who
245 - use the __git_complete helper to define completion to their custom
246 - command.
247 -
248 - Will merge to 'master'.
249 -
250 -
251 -* jk/test-avoid-globmatch-with-skip-patterns (2021-07-01) 1 commit
252 - (merged to 'next' on 2021-07-01 at 139fa916d1)
253 - + test-lib: avoid accidental globbing in match_pattern_list()
254 -
255 - We broke "GIT_SKIP_TESTS=t?000" to skip certain tests in recent
256 - update, which got fixed.
257 -
258 - Will merge to 'master'.
259 -
260 -
261 -* jk/test-without-readlink-1 (2021-06-19) 1 commit
262 - (merged to 'next' on 2021-07-01 at fb3bf5a6b0)
263 - + t: use portable wrapper for readlink(1)
264 -
265 - Some test scripts assumed that readlink(1) was universally
266 - installed and available, which is not the case.
267 -
268 - Will merge to 'master'.
269 -
270 -
271 -* jx/sideband-cleanup (2021-06-17) 4 commits
272 - (merged to 'next' on 2021-07-01 at 0eb604e8c2)
273 - + test: refactor to use "get_abbrev_oid" to get abbrev oid
274 - + test: refactor to use "test_commit" to create commits
275 - + test: compare raw output, not mangle tabs and spaces
276 - + sideband: don't lose clear-to-eol at packet boundary
277 -
278 - The side-band demultiplexer that is used to display progress output
279 - from the remote end did not clear the line properly when the end of
280 - line hits at a packet boundary, which has been corrected. Also
281 - comes with test clean-ups.
282 -
283 - Will merge to 'master'.
539 + Expecting a reroll?
540 + cf. <pull.992.v2.git.1625759443.gitgitgadget@gmail.com>
541 + cf. <CAPig+cSsPrQrP9xk8M8H339_NpYqKh1okeo1V-fAJ2zk3QeOjQ@mail.gmail.com>
542
543
544 * ab/bundle-doc (2021-07-02) 3 commits
@@ -294,17 +552,6 @@ Release tarballs are available at:
552 at least for the second patch.
553
554
297 -* ab/fix-columns-to-80-during-tests (2021-06-29) 1 commit
298 - (merged to 'next' on 2021-07-01 at e8cbef661b)
299 - + test-lib.sh: set COLUMNS=80 for --verbose repeatability
300 -
301 - Output from some of our tests were affected by the width of the
302 - terminal that they were run in, which has been corrected by
303 - exporting a fixed value in the COLUMNS environment.
304 -
305 - Will merge to 'master'.
306 -
307 -
555 * ab/pack-stdin-packs-fix (2021-06-28) 2 commits
556 - pack-objects: fix segfault in --stdin-packs option
557 - pack-objects tests: cover blindspots in stdin handling
@@ -316,31 +563,22 @@ Release tarballs are available at:
563 cf. <YND3h2l10PlnSNGJ@nand.local>
564
565
319 -* ar/more-typofix (2021-06-28) 3 commits
320 - (merged to 'next' on 2021-07-01 at 02ca61ee96)
321 - + git-worktree.txt: fix typo in example path
322 - + t: fix typos in test messages
323 - + blame: correct name of config option in docs
324 -
325 - Typofixes.
326 -
327 - Will merge to 'master'.
328 -
329 -
566 * bk/doc-commit-typofix (2021-06-28) 1 commit
331 - - Documentation: fix typo in the --patch option of the commit command
567 + (merged to 'next' on 2021-07-06 at 88580c54ed)
568 + + Documentation: fix typo in the --patch option of the commit command
569
570 Doc typo/grammo-fix.
571
335 - Will merge to 'next'.
572 + Will merge to 'master'.
573
574
575 * dc/p4-binary-submit-fix (2021-06-28) 1 commit
339 - - git-p4: fix failed submit by skip non-text data files
576 + (merged to 'next' on 2021-07-06 at dec280fdc6)
577 + + git-p4: fix failed submit by skip non-text data files
578
579 Prevent "git p4" from failing to submit changes to binary file.
580
343 - Will merge to 'next'.
581 + Will merge to 'master'.
582
583
584 * ds/commit-and-checkout-with-sparse-index (2021-06-28) 5 commits
@@ -358,17 +596,18 @@ Release tarballs are available at:
596
597
598 * en/merge-dir-rename-corner-case-fix (2021-06-30) 3 commits
361 - - merge-recursive: handle rename-to-self case
362 - - merge-ort: ensure we consult df_conflict and path_conflicts
363 - - t6423: test directory renames causing rename-to-self
599 + (merged to 'next' on 2021-07-08 at cf7087576e)
600 + + merge-recursive: handle rename-to-self case
601 + + merge-ort: ensure we consult df_conflict and path_conflicts
602 + + t6423: test directory renames causing rename-to-self
603
604 The merge code had funny interactions between content based rename
605 detection and directory rename detection.
606
368 - Will merge to 'next'.
607 + Will merge to 'master'.
608
609
371 -* ew/many-alternate-optim (2021-06-29) 5 commits
610 +* ew/many-alternate-optim (2021-07-07) 5 commits
611 - oidtree: a crit-bit tree for odb_loose_cache
612 - oidcpy_with_padding: constify `src' arg
613 - make object_directory.loose_objects_subdir_seen a bitmap
@@ -377,21 +616,22 @@ Release tarballs are available at:
616
617 Optimization for repositories with many alternate object store.
618
380 - Will merge to 'next'.
619 + Will merge to 'next'?
620
621
622 * jk/log-decorate-optim (2021-06-28) 6 commits
384 - - add_ref_decoration(): rename s/type/deco_type/
385 - - load_ref_decorations(): avoid parsing non-tag objects
386 - - object.h: add lookup_object_by_type() function
387 - - object.h: expand docstring for lookup_unknown_object()
388 - - log: avoid loading decorations for userformats that don't need it
389 - - pretty.h: update and expand docstring for userformat_find_requirements()
623 + (merged to 'next' on 2021-07-08 at a3b6f978ab)
624 + + add_ref_decoration(): rename s/type/deco_type/
625 + + load_ref_decorations(): avoid parsing non-tag objects
626 + + object.h: add lookup_object_by_type() function
627 + + object.h: expand docstring for lookup_unknown_object()
628 + + log: avoid loading decorations for userformats that don't need it
629 + + pretty.h: update and expand docstring for userformat_find_requirements()
630
631 Optimize "git log" for cases where we wasted cycles to load ref
632 decoration data that may not be needed.
633
394 - Will merge to 'next'.
634 + Will merge to 'master'.
635
636
637 * js/ci-windows-update (2021-07-06) 7 commits
@@ -405,23 +645,27 @@ Release tarballs are available at:
645
646 GitHub Actions / CI update.
647
648 + Will merge to 'next'.
649 +
650
651 * js/config-mak-windows-pcre-fix (2021-06-28) 1 commit
410 - - config.mak.uname: PCRE1 cleanup
652 + (merged to 'next' on 2021-07-08 at fe457da682)
653 + + config.mak.uname: PCRE1 cleanup
654
655 Whitespace fix.
656
414 - Will merge to 'next'.
657 + Will merge to 'master'.
658
659
660 * js/gfw-system-config-loc-fix (2021-06-28) 3 commits
418 - - config: normalize the path of the system gitconfig
419 - - cmake(windows): set correct path to the system Git config
420 - - mingw: move Git for Windows' system config where users expect it
661 + (merged to 'next' on 2021-07-08 at 91a090ab50)
662 + + config: normalize the path of the system gitconfig
663 + + cmake(windows): set correct path to the system Git config
664 + + mingw: move Git for Windows' system config where users expect it
665
666 Update the location of system-side configuration file on Windows.
667
424 - Will merge to 'next'.
668 + Will merge to 'master'.
669
670
671 * jt/push-negotiation-fixes (2021-06-28) 3 commits
@@ -436,62 +680,68 @@ Release tarballs are available at:
680
681
682 * ks/submodule-cleanup (2021-06-28) 1 commit
439 - - submodule: remove unnecessary `prefix` based option logic
683 + (merged to 'next' on 2021-07-08 at 03ba93067f)
684 + + submodule: remove unnecessary `prefix` based option logic
685
686 Code cleanup.
687
443 - Will merge to 'next'.
688 + Will merge to 'master'.
689
690
691 * rs/grep-parser-fix (2021-06-30) 1 commit
447 - - grep: report missing left operand of --and
692 + (merged to 'next' on 2021-07-06 at 8c582fcd64)
693 + + grep: report missing left operand of --and
694
695 "git grep --and -e foo" ought to have been diagnosed as an error
696 but instead segfaulted, which has been corrected.
697
452 - Will merge to 'next'.
698 + Will merge to 'master'.
699
700
701 * tb/midx-use-checksum (2021-06-28) 4 commits
456 - - midx: report checksum mismatches during 'verify'
457 - - midx: don't reuse corrupt MIDXs when writing
458 - - commit-graph: rewrite to use checksum_valid()
459 - - csum-file: introduce checksum_valid()
702 + (merged to 'next' on 2021-07-08 at bbaac9c721)
703 + + midx: report checksum mismatches during 'verify'
704 + + midx: don't reuse corrupt MIDXs when writing
705 + + commit-graph: rewrite to use checksum_valid()
706 + + csum-file: introduce checksum_valid()
707
708 When rebuilding the multi-pack index file reusing an existing one,
709 we used to blindly trust the existing file and ended up carrying
710 corrupted data into the updated file, which has been corrected.
711
465 - Will merge to 'next'.
712 + Will merge to 'master'.
713
714
715 * ab/bundle-updates (2021-07-06) 3 commits
469 - - bundle: remove "ref_list" in favor of string-list.c API
470 - - bundle.c: use a temporary variable for OIDs and names
471 - - bundle cmd: stop leaking memory from parse_options_cmd_bundle()
716 + (merged to 'next' on 2021-07-08 at 0c9c54fad7)
717 + + bundle: remove "ref_list" in favor of string-list.c API
718 + + bundle.c: use a temporary variable for OIDs and names
719 + + bundle cmd: stop leaking memory from parse_options_cmd_bundle()
720
721 Code clean-up and leak plugging in "git bundle".
722
475 - Will merge to 'next'.
723 + Will merge to 'master'.
724
725
478 -* ab/fetch-negotiate-segv-fix (2021-06-30) 3 commits
479 - - fetch: fix segfault in --negotiate-only without --negotiation-tip=*
480 - - fetch: document the --negotiate-only option
481 - - send-pack.c: move "no refs in common" abort earlier
726 +* ab/fetch-negotiate-segv-fix (2021-07-08) 3 commits
727 + (merged to 'next' on 2021-07-08 at 30dcd90ea6)
728 + + fetch: fix segfault in --negotiate-only without --negotiation-tip=*
729 + + fetch: document the --negotiate-only option
730 + + send-pack.c: move "no refs in common" abort earlier
731
483 - Code recently added to support common ancestory negotiation during
732 + Code recently added to support common ancestry negotiation during
733 "git push" did not sanity check its arguments carefully enough.
734
486 - Will merge to 'next'.
735 + Will merge to 'master'.
736
737
738 * ab/make-delete-on-error (2021-06-29) 1 commit
490 - - Makefile: add and use the ".DELETE_ON_ERROR" flag
739 + (merged to 'next' on 2021-07-08 at 787d70d2d6)
740 + + Makefile: add and use the ".DELETE_ON_ERROR" flag
741
742 Use ".DELETE_ON_ERROR" pseudo target to simplify our Makefile.
743
494 - Will merge to 'next'.
744 + Will merge to 'master'.
745
746
747 * ab/make-tags-cleanup (2021-06-29) 5 commits
@@ -510,11 +760,12 @@ Release tarballs are available at:
760
761
762 * ew/mmap-failures (2021-06-29) 1 commit
513 - - xmmap: inform Linux users of tuning knobs on ENOMEM
763 + (merged to 'next' on 2021-07-08 at e0e19d5d26)
764 + + xmmap: inform Linux users of tuning knobs on ENOMEM
765
766 Error message update.
767
517 - Will merge to 'next'.
768 + Will merge to 'master'.
769
770
771 * tb/multi-pack-bitmaps (2021-06-28) 24 commits
@@ -576,45 +827,47 @@ Release tarballs are available at:
827
828
829 * ab/describe-tests-fix (2021-05-11) 5 commits
579 - - describe tests: support -C in "check_describe"
580 - - describe tests: fix nested "test_expect_success" call
581 - - describe tests: don't rely on err.actual from "check_describe"
582 - - describe tests: refactor away from glob matching
583 - - describe tests: improve test for --work-tree & --dirty
830 + (merged to 'next' on 2021-07-06 at ba1f7c0364)
831 + + describe tests: support -C in "check_describe"
832 + + describe tests: fix nested "test_expect_success" call
833 + + describe tests: don't rely on err.actual from "check_describe"
834 + + describe tests: refactor away from glob matching
835 + + describe tests: improve test for --work-tree & --dirty
836
837 Various updates to tests around "git describe"
838
587 - Will merge to 'next'.
839 + Will merge to 'master'.
840
841
842 * ab/pickaxe-pcre2 (2021-05-11) 22 commits
591 - - xdiff-interface: replace discard_hunk_line() with a flag
592 - - xdiff users: use designated initializers for out_line
593 - - pickaxe -G: don't special-case create/delete
594 - - pickaxe -G: terminate early on matching lines
595 - - xdiff-interface: allow early return from xdiff_emit_line_fn
596 - - xdiff-interface: prepare for allowing early return
597 - - pickaxe -S: slightly optimize contains()
598 - - pickaxe: rename variables in has_changes() for brevity
599 - - pickaxe -S: support content with NULs under --pickaxe-regex
600 - - pickaxe: assert that we must have a needle under -G or -S
601 - - pickaxe: refactor function selection in diffcore-pickaxe()
602 - - perf: add performance test for pickaxe
603 - - pickaxe/style: consolidate declarations and assignments
604 - - diff.h: move pickaxe fields together again
605 - - pickaxe: die when --find-object and --pickaxe-all are combined
606 - - pickaxe: die when -G and --pickaxe-regex are combined
607 - - pickaxe tests: add missing test for --no-pickaxe-regex being an error
608 - - pickaxe tests: test for -G, -S and --find-object incompatibility
609 - - pickaxe tests: add test for "log -S" not being a regex
610 - - pickaxe tests: add test for diffgrep_consume() internals
611 - - pickaxe tests: refactor to use test_commit --append --printf
612 - - grep/pcre2 tests: reword comments referring to kwset
843 + (merged to 'next' on 2021-07-06 at fdb4fdc245)
844 + + xdiff-interface: replace discard_hunk_line() with a flag
845 + + xdiff users: use designated initializers for out_line
846 + + pickaxe -G: don't special-case create/delete
847 + + pickaxe -G: terminate early on matching lines
848 + + xdiff-interface: allow early return from xdiff_emit_line_fn
849 + + xdiff-interface: prepare for allowing early return
850 + + pickaxe -S: slightly optimize contains()
851 + + pickaxe: rename variables in has_changes() for brevity
852 + + pickaxe -S: support content with NULs under --pickaxe-regex
853 + + pickaxe: assert that we must have a needle under -G or -S
854 + + pickaxe: refactor function selection in diffcore-pickaxe()
855 + + perf: add performance test for pickaxe
856 + + pickaxe/style: consolidate declarations and assignments
857 + + diff.h: move pickaxe fields together again
858 + + pickaxe: die when --find-object and --pickaxe-all are combined
859 + + pickaxe: die when -G and --pickaxe-regex are combined
860 + + pickaxe tests: add missing test for --no-pickaxe-regex being an error
861 + + pickaxe tests: test for -G, -S and --find-object incompatibility
862 + + pickaxe tests: add test for "log -S" not being a regex
863 + + pickaxe tests: add test for diffgrep_consume() internals
864 + + pickaxe tests: refactor to use test_commit --append --printf
865 + + grep/pcre2 tests: reword comments referring to kwset
866
867 Rewrite the backend for "diff -G/-S" to use pcre2 engine when
868 available.
869
617 - Will merge to 'next'.
870 + Will merge to 'master'.
871
872
873 * ab/config-based-hooks-base (2021-06-29) 33 commits
@@ -659,15 +912,6 @@ Release tarballs are available at:
912 Waiting for reviews.
913
914
662 -* ab/config-hooks-path-testfix (2021-06-16) 1 commit
663 - (merged to 'next' on 2021-07-01 at 2ab6dbe8af)
664 - + pre-commit hook tests: don't leave "actual" nonexisting on failure
665 -
666 - Test fix.
667 -
668 - Will merge to 'master'.
669 -
670 -
915 * ab/doc-retire-alice-bob (2021-06-16) 6 commits
916 - pack-protocol doc: use "www-data" in place of "alice"
917 - doc: replace "alice" and "bob" with "jdoe" and "msmith"
@@ -679,118 +923,57 @@ Release tarballs are available at:
923 Documentation update to avoid Alice and Bob in contexts where Eve
924 does not appear in.
925
926 + Will discard.
927 + Let's shelve this one for now, as it does not seem to solve any
928 + real problems (other than ceasing to use Alice and Bob in contexts
929 + that do not call for Eve).
930 +
931
932 * ab/pre-auto-gc-hook-test (2021-06-16) 1 commit
684 - - gc tests: add a test for the "pre-auto-gc" hook
933 + (merged to 'next' on 2021-07-06 at 305a15ee1d)
934 + + gc tests: add a test for the "pre-auto-gc" hook
935
936 Test fix.
937
688 - Will merge to 'next'.
689 -
690 -
691 -* jv/userdiff-csharp-update (2021-06-16) 1 commit
692 - (merged to 'next' on 2021-07-01 at a2371d0580)
693 - + userdiff: add support for C# record types
694 -
695 - The userdiff pattern for C# learned the token "record".
696 -
938 Will merge to 'master'.
939
940
941 * en/ort-perf-batch-13 (2021-06-28) 5 commits
701 - - merge-ort: add prefetching for content merges
702 - - diffcore-rename: use a different prefetch for basename comparisons
703 - - diffcore-rename: allow different missing_object_cb functions
704 - - t6421: add tests checking for excessive object downloads during merge
705 - - promisor-remote: output trace2 statistics for number of objects fetched
942 + (merged to 'next' on 2021-07-08 at 39aad121d3)
943 + + merge-ort: add prefetching for content merges
944 + + diffcore-rename: use a different prefetch for basename comparisons
945 + + diffcore-rename: allow different missing_object_cb functions
946 + + t6421: add tests checking for excessive object downloads during merge
947 + + promisor-remote: output trace2 statistics for number of objects fetched
948
949 Performance tweaks of "git merge -sort" around lazy fetching of objects.
950
709 - Will merge to 'next'.
951 + Will merge to 'master'.
952
953
954 * ab/serve-cleanup (2021-06-28) 8 commits
955 - upload-pack.c: convert to new serve.c "startup" config cb
956 - serve: add support for a "startup" git_config() callback
957 - serve.c: add trace2 regions for advertise & command
716 - - serve.c: add call_{advertise,command}() indirection
717 - - serve: use designated initializers
718 - - transport: use designated initializers
719 - - transport: rename "fetch" in transport_vtable to "fetch_refs"
720 - - serve: mark has_capability() as static
721 -
722 - Code clean-up around "git serve".
723 -
724 -
725 -* js/stop-exporting-bogus-columns (2021-06-28) 1 commit
726 - (merged to 'next' on 2021-07-02 at 7674896d58)
727 - + pager: avoid setting COLUMNS when we're guessing its value
728 -
729 - When we cannot figure out how wide the terminal is, we use a
730 - fallback value of 80 ourselves (which cannot be avoided), but when
731 - we run the pager, we export it in COLUMNS, which forces the pager
732 - to use the hardcoded value, even when the pager is perfectly
733 - capable to figure it out itself. Stop exporting COLUMNS when we
734 - fall back on the hardcoded default value for our own use.
735 -
736 - Will merge to 'master'.
737 -
738 -
739 -* ah/uninitialized-reads-fix (2021-06-15) 3 commits
740 - (merged to 'next' on 2021-07-01 at 61a967c340)
741 - + builtin/checkout--worker: zero-initialise struct to avoid MSAN complaints
742 - + split-index: use oideq instead of memcmp to compare object_id's
743 - + bulk-checkin: make buffer reuse more obvious and safer
744 -
745 - Make the codebase MSAN clean.
746 -
747 - Will merge to 'master'.
748 -
749 -
750 -* ar/typofix (2021-06-14) 1 commit
751 - (merged to 'next' on 2021-07-01 at 8d10d6d568)
752 - + *: fix typos which duplicate a word
753 -
754 - Typofixes.
755 -
756 - Will merge to 'master'.
757 -
758 -
759 -* jk/revision-squelch-gcc-warning (2021-06-11) 1 commit
760 - (merged to 'next' on 2021-07-01 at 28f4da3e7d)
761 - + add_pending_object_with_path(): work around "gcc -O3" complaint
762 -
763 - Warning fix.
764 -
765 - Will merge to 'master'.
766 -
767 -
768 -* jk/union-merge-binary (2021-06-11) 3 commits
769 - - ll_union_merge(): rename path_unused parameter
770 - - ll_union_merge(): pass name labels to ll_xdl_merge()
771 - - ll_binary_merge(): handle XDL_MERGE_FAVOR_UNION
772 -
773 - The "union" conflict resultion variant misbehaved when used with
774 - binary merge driver.
775 -
776 - Will merge to 'next'.
777 -
778 -
779 -* js/no-more-multimail (2021-06-11) 1 commit
780 - (merged to 'next' on 2021-07-01 at ed7a4efc75)
781 - + multimail: stop shipping a copy
958 + - serve.c: add call_{advertise,command}() indirection
959 + - serve: use designated initializers
960 + - transport: use designated initializers
961 + - transport: rename "fetch" in transport_vtable to "fetch_refs"
962 + - serve: mark has_capability() as static
963
783 - Remove multimail from contrib/
964 + Code clean-up around "git serve".
965
785 - Will merge to 'master'.
966 + Comments?
967
968
788 -* js/subtree-on-windows-fix (2021-06-15) 2 commits
789 - (merged to 'next' on 2021-07-01 at d4e4ccde63)
790 - + subtree: fix assumption about the directory separator
791 - + subtree: fix the GIT_EXEC_PATH sanity check to work on Windows
969 +* jk/union-merge-binary (2021-06-11) 3 commits
970 + (merged to 'next' on 2021-07-06 at 5e77055895)
971 + + ll_union_merge(): rename path_unused parameter
972 + + ll_union_merge(): pass name labels to ll_xdl_merge()
973 + + ll_binary_merge(): handle XDL_MERGE_FAVOR_UNION
974
793 - Update "git subtree" to work better on Windows.
975 + The "union" conflict resultion variant misbehaved when used with
976 + binary merge driver.
977
978 Will merge to 'master'.
979
@@ -805,39 +988,32 @@ Release tarballs are available at:
988 Prepare the internals for lazily fetching objects in submodules
989 from their promisor remotes.
990
808 - Waiting for reviews.
991 + Will merge to 'next'.
992
993
994 * ab/mktag-tests (2021-06-28) 6 commits
812 - - mktag tests: test fast-export
813 - - mktag tests: test for-each-ref
814 - - mktag tests: test update-ref and reachable fsck
815 - - mktag tests: test hash-object --literally and unreachable fsck
816 - - mktag tests: invert --no-strict test
817 - - mktag tests: parse out options in helper
995 + (merged to 'next' on 2021-07-08 at bfd55b0a38)
996 + + mktag tests: test fast-export
997 + + mktag tests: test for-each-ref
998 + + mktag tests: test update-ref and reachable fsck
999 + + mktag tests: test hash-object --literally and unreachable fsck
1000 + + mktag tests: invert --no-strict test
1001 + + mktag tests: parse out options in helper
1002
1003 Fill test gaps.
1004
821 - Will merge to 'next'.
1005 + Will merge to 'master'.
1006
1007
1008 * ab/show-branch-tests (2021-06-28) 4 commits
825 - - show-branch tests: add missing tests
826 - - show-branch: don't <COLOR></RESET> for space characters
827 - - show-branch tests: modernize test code
828 - - show-branch tests: rename the one "show-branch" test file
1009 + (merged to 'next' on 2021-07-08 at 47f90868cf)
1010 + + show-branch tests: add missing tests
1011 + + show-branch: don't <COLOR></RESET> for space characters
1012 + + show-branch tests: modernize test code
1013 + + show-branch tests: rename the one "show-branch" test file
1014
1015 Fill test gaps.
1016
832 - Will merge to 'next'.
833 -
834 -
835 -* ah/graph-typofix (2021-06-15) 1 commit
836 - (merged to 'next' on 2021-07-01 at c71fb8cbcb)
837 - + graph: improve grammar of "invalid color" error message
838 -
839 - Typofix in an error message.
840 -
1017 Will merge to 'master'.
1018
1019
@@ -854,36 +1030,6 @@ Release tarballs are available at:
1030 Waiting for reviews.
1031
1032
857 -* fc/pull-cleanups (2021-06-19) 3 commits
858 - (merged to 'next' on 2021-07-01 at f8d7a3fc78)
859 - + pull: trivial whitespace style fix
860 - + pull: trivial cleanup
861 - + pull: cleanup autostash check
862 -
863 - Code cleanup.
864 -
865 - Will merge to 'master'.
866 -
867 -
868 -* jk/bitmap-tree-optim (2021-06-15) 1 commit
869 - (merged to 'next' on 2021-07-01 at 2e0f108bb6)
870 - + bitmaps: don't recurse into trees already in the bitmap
871 -
872 - Avoid duplicated work while building reachability bitmaps.
873 -
874 - Will merge to 'master'.
875 -
876 -
877 -* jx/t6020-with-older-bash (2021-06-17) 1 commit
878 - (merged to 'next' on 2021-07-01 at 55d71ed779)
879 - + t6020: fix incompatible parameter expansion
880 -
881 - Work around inefficient glob substitution in older versions of bash
882 - by rewriting parts of a test.
883 -
884 - Will merge to 'master'.
885 -
886 -
1033 * en/zdiff3 (2021-06-15) 2 commits
1034 - update documentation for new zdiff3 conflictStyle
1035 - xdiff: implement a zealous diff3, or "zdiff3"
@@ -913,8 +1059,7 @@ Release tarballs are available at:
1059 cf. <094f5e5f-d447-8867-a9a7-be5c8827bba6@gmail.com>
1060
1061
916 -* hn/refs-errno-cleanup (2021-07-06) 7 commits
917 - - SQUASH???
1062 +* hn/refs-errno-cleanup (2021-07-07) 6 commits
1063 - refs: make errno output explicit for refs_resolve_ref_unsafe
1064 - refs: explicitly return failure_errno from parse_loose_ref_contents
1065 - refs: add failure_errno to refs_read_raw_ref() signature
@@ -925,25 +1070,7 @@ Release tarballs are available at:
1070 Futz with the way 'errno' is relied on in the refs API to carry the
1071 failure modes up the callchain.
1072
928 - Expecting a (hopefully final) reroll.
929 -
930 -
931 -* ab/cmd-foo-should-return (2021-06-09) 1 commit
932 - (merged to 'next' on 2021-07-02 at 4f91c90007)
933 - + builtins + test helpers: use return instead of exit() in cmd_*
934 -
935 - Code clean-up.
936 -
937 - Will merge to 'master'.
938 -
939 -
940 -* ab/progress-cleanup (2021-06-08) 1 commit
941 - (merged to 'next' on 2021-07-02 at 288570c95a)
942 - + read-cache.c: don't guard calls to progress.c API
943 -
944 - Code clean-up.
945 -
946 - Will merge to 'master'.
1073 + Will merge to 'next'.
1074
1075
1076 * ab/test-tool-cache-cleanup (2021-06-08) 4 commits
@@ -957,61 +1084,6 @@ Release tarballs are available at:
1084 Waiting for reviews.
1085
1086
960 -* ab/xdiff-bug-cleanup (2021-06-08) 1 commit
961 - (merged to 'next' on 2021-07-02 at f4920ba6d1)
962 - + xdiff: use BUG(...), not xdl_bug(...)
963 -
964 - Code clean-up.
965 -
966 - Will merge to 'master'.
967 -
968 -
969 -* ar/test-code-cleanup (2021-06-08) 1 commit
970 - (merged to 'next' on 2021-07-02 at 12d23f8a42)
971 - + t: fix whitespace around &&
972 -
973 - Test code clean-up.
974 -
975 - Will merge to 'master'.
976 -
977 -
978 -* ba/object-info (2021-06-08) 1 commit
979 - (merged to 'next' on 2021-07-02 at c7fb4f900e)
980 - + protocol-caps.h: add newline at end of file
981 -
982 - Code clean-up.
983 -
984 - Will merge to 'master'.
985 -
986 -
987 -* dd/document-log-decorate-default (2021-06-08) 1 commit
988 - (merged to 'next' on 2021-07-02 at 529d71a690)
989 - + doc/log: correct default for --decorate
990 -
991 - Doc clean-up.
992 -
993 - Will merge to 'master'.
994 -
995 -
996 -* fc/doc-default-to-upstream-config (2021-06-08) 1 commit
997 - (merged to 'next' on 2021-07-01 at 3ce7d14f26)
998 - + doc: merge: mention default of defaulttoupstream
999 -
1000 - Doc clean-up.
1001 -
1002 - Will merge to 'master'.
1003 -
1004 -
1005 -* ms/mergetools-kdiff3-on-windows (2021-06-08) 1 commit
1006 - (merged to 'next' on 2021-07-02 at 5ca2515f34)
1007 - + mergetools/kdiff3: make kdiff3 work on Windows too
1008 -
1009 - On Windows, mergetool has been taught to find kdiff3.exe just like
1010 - it finds winmerge.exe.
1011 -
1012 - Will merge to 'master'.
1013 -
1014 -
1087 * ab/pack-objects-stdin (2021-06-28) 4 commits
1088 - pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS
1089 - pack-objects.c: do stdin parsing via revision.c's API
@@ -1021,47 +1093,37 @@ Release tarballs are available at:
1093 Code clean-up.
1094
1095
1024 -* ar/doc-libera-chat-in-my-first-contrib (2021-06-09) 1 commit
1025 - (merged to 'next' on 2021-07-02 at a0e3a1f5f2)
1026 - + MyFirstContribution: link #git-devel to Libera Chat
1027 -
1028 - Update MyFirst document.
1029 -
1030 - Will merge to 'master'.
1031 -
1032 -
1033 -* ar/mailinfo-memcmp-to-skip-prefix (2021-06-09) 1 commit
1034 - (merged to 'next' on 2021-07-02 at e5122960c0)
1035 - + mailinfo: use starts_with() when checking scissors
1036 -
1037 - Code clean-up.
1038 -
1039 - Will merge to 'master'.
1040 -
1041 -
1042 -* ar/submodule-add (2021-06-16) 3 commits
1043 - - submodule--helper: introduce add-config subcommand
1096 +* ar/submodule-add (2021-07-08) 4 commits
1097 - submodule--helper: introduce add-clone subcommand
1098 - submodule--helper: refactor module_clone()
1099 + - submodule: prefix die messages with 'fatal'
1100 + - t7400: test failure to add submodule in tracked path
1101
1102 Rewrite of "git submodule" in C continues.
1103
1049 - Waiting for reviews.
1104 + Will merge to 'next'.
1105
1106
1052 -* ds/gender-neutral-doc (2021-06-16) 5 commits
1053 - - SQUASH??? replace neutering tips with that of Æver
1054 - - CodingGuidelines: recommend singular they
1107 +* ds/gender-neutral-doc (2021-06-16) 3 commits
1108 - *: fix typos
1109 - comments: avoid using the gender of our users
1110 - doc: avoid using the gender of other people
1111 + (this branch is used by ds/gender-neutral-doc-guidelines.)
1112 +
1113 + Update the documentation not to assume users are of certain gender
1114 + and adds to guidelines to do so.
1115 +
1116 + Will merge to 'next'.
1117
1059 - Attempt to update the documentation not to assume users are of
1060 - certain gender and adds to guidelines to do so.
1118
1062 - Will wait for conclusion of the on-list discussion.
1063 - It appears that the updates to the text are favourably accepted by
1064 - reviewers, but not necessarily the update to the guidelines.
1119 +* ds/gender-neutral-doc-guidelines (2021-06-16) 2 commits
1120 + - SQUASH??? replace neutering tips with that of Æver
1121 + - CodingGuidelines: recommend singular they
1122 + (this branch uses ds/gender-neutral-doc.)
1123 +
1124 + Attempt to give a guideline for gender neutral documentation.
1125 +
1126 + Comments?
1127
1128
1129 * gh/gitweb-branch-sort (2021-06-10) 1 commit
@@ -1073,15 +1135,6 @@ Release tarballs are available at:
1135 Waiting for reviews.
1136
1137
1076 -* jk/doc-max-pack-size (2021-06-09) 1 commit
1077 - (merged to 'next' on 2021-07-02 at b272fddb22)
1078 - + doc: warn people against --max-pack-size
1079 -
1080 - Doc update.
1081 -
1082 - Will merge to 'master'.
1083 -
1084 -
1138 * lh/systemd-timers (2021-07-02) 3 commits
1139 - maintenance: add support for systemd timers on Linux
1140 - maintenance: `git maintenance run` learned `--scheduler=<scheduler>`
@@ -1093,17 +1146,6 @@ Release tarballs are available at:
1146 Waiting for reviews.
1147
1148
1096 -* dd/svn-test-wo-locale-a (2021-06-08) 1 commit
1097 - (merged to 'next' on 2021-07-01 at 9fa432af22)
1098 - + t: use user-specified utf-8 locale for testing svn
1099 -
1100 - "git-svn" tests assumed that "locale -a", which is used to pick an
1101 - available UTF-8 locale, is available everywhere. A knob has been
1102 - introduced to allow testers to specify a suitable locale to use.
1103 -
1104 - Will merge to 'master'.
1105 -
1106 -
1149 * fc/completion-updates (2021-06-07) 4 commits
1150 - completion: bash: add correct suffix in variables
1151 - completion: bash: fix for multiple dash commands
@@ -1117,13 +1159,14 @@ Release tarballs are available at:
1159
1160
1161 * mr/cmake (2021-06-11) 3 commits
1120 - - cmake: add warning for ignored MSGFMT_EXE
1121 - - cmake: create compile_commands.json by default
1122 - - cmake: add knob to disable vcpkg
1162 + (merged to 'next' on 2021-07-06 at efc86eb8fb)
1163 + + cmake: add warning for ignored MSGFMT_EXE
1164 + + cmake: create compile_commands.json by default
1165 + + cmake: add knob to disable vcpkg
1166
1167 CMake update.
1168
1126 - Will merge to 'next'.
1169 + Will merge to 'master'.
1170
1171
1172 * ab/update-submitting-patches (2021-06-08) 3 commits
@@ -1139,50 +1182,33 @@ Release tarballs are available at:
1182
1183
1184 * hn/prep-tests-for-reftable (2021-06-02) 22 commits
1142 - - t1415: set REFFILES for test specific to storage format
1143 - - t4202: mark bogus head hash test with REFFILES
1144 - - t7003: check reflog existence only for REFFILES
1145 - - t7900: stop checking for loose refs
1146 - - t1404: mark tests that muck with .git directly as REFFILES.
1147 - - t2017: mark --orphan/logAllRefUpdates=false test as REFFILES
1148 - - t1414: mark corruption test with REFFILES
1149 - - t1407: require REFFILES for for_each_reflog test
1150 - - test-lib: provide test prereq REFFILES
1151 - - t5304: use "reflog expire --all" to clear the reflog
1152 - - t5304: restyle: trim empty lines, drop ':' before >
1153 - - t7003: use rev-parse rather than FS inspection
1154 - - t5000: inspect HEAD using git-rev-parse
1155 - - t5000: reformat indentation to the latest fashion
1156 - - t1301: fix typo in error message
1157 - - t1413: use tar to save and restore entire .git directory
1158 - - t1401-symbolic-ref: avoid direct filesystem access
1159 - - t1401: use tar to snapshot and restore repo state
1160 - - t5601: read HEAD using rev-parse
1161 - - t9300: check ref existence using test-helper rather than a file system check
1162 - - t/helper/ref-store: initialize oid in resolve-ref
1163 - - t4202: split testcase for invalid HEAD symref and HEAD hash
1185 + (merged to 'next' on 2021-07-06 at 0d6f79d079)
1186 + + t1415: set REFFILES for test specific to storage format
1187 + + t4202: mark bogus head hash test with REFFILES
1188 + + t7003: check reflog existence only for REFFILES
1189 + + t7900: stop checking for loose refs
1190 + + t1404: mark tests that muck with .git directly as REFFILES.
1191 + + t2017: mark --orphan/logAllRefUpdates=false test as REFFILES
1192 + + t1414: mark corruption test with REFFILES
1193 + + t1407: require REFFILES for for_each_reflog test
1194 + + test-lib: provide test prereq REFFILES
1195 + + t5304: use "reflog expire --all" to clear the reflog
1196 + + t5304: restyle: trim empty lines, drop ':' before >
1197 + + t7003: use rev-parse rather than FS inspection
1198 + + t5000: inspect HEAD using git-rev-parse
1199 + + t5000: reformat indentation to the latest fashion
1200 + + t1301: fix typo in error message
1201 + + t1413: use tar to save and restore entire .git directory
1202 + + t1401-symbolic-ref: avoid direct filesystem access
1203 + + t1401: use tar to snapshot and restore repo state
1204 + + t5601: read HEAD using rev-parse
1205 + + t9300: check ref existence using test-helper rather than a file system check
1206 + + t/helper/ref-store: initialize oid in resolve-ref
1207 + + t4202: split testcase for invalid HEAD symref and HEAD hash
1208
1209 Preliminary clean-up of tests before the main reftable changes
1210 hits the codebase.
1211
1168 - Will merge to 'next'.
1169 -
1170 -
1171 -* js/trace2-discard-event-docfix (2021-06-04) 1 commit
1172 - (merged to 'next' on 2021-07-01 at 9fc3c6285e)
1173 - + docs: fix api-trace2 doc for "too_many_files" event
1174 -
1175 - Docfix.
1176 -
1177 - Will merge to 'master'.
1178 -
1179 -
1180 -* tk/partial-clone-repack-doc (2021-06-04) 1 commit
1181 - (merged to 'next' on 2021-07-01 at fe4c6280bc)
1182 - + Remove warning that repack only works on non-promisor packfiles
1183 -
1184 - Docfix.
1185 -
1212 Will merge to 'master'.
1213
1214
@@ -1199,60 +1225,53 @@ Release tarballs are available at:
1225
1226
1227 * fc/push-simple-updates (2021-06-02) 7 commits
1202 - - doc: push: explain default=simple correctly
1203 - - push: remove unused code in setup_push_upstream()
1204 - - push: simplify setup_push_simple()
1205 - - push: reorganize setup_push_simple()
1206 - - push: copy code to setup_push_simple()
1207 - - push: hedge code of default=simple
1208 - - push: rename !triangular to same_remote
1228 + (merged to 'next' on 2021-07-06 at 95c114f930)
1229 + + doc: push: explain default=simple correctly
1230 + + push: remove unused code in setup_push_upstream()
1231 + + push: simplify setup_push_simple()
1232 + + push: reorganize setup_push_simple()
1233 + + push: copy code to setup_push_simple()
1234 + + push: hedge code of default=simple
1235 + + push: rename !triangular to same_remote
1236 (this branch is used by fc/push-simple-updates-cleanup.)
1237
1238 Some code and doc clarification around "git push".
1239
1213 - Will merge to 'next'.
1240 + Will merge to 'master'.
1241
1242
1243 * fc/push-simple-updates-cleanup (2021-06-02) 13 commits
1217 - - push: don't get a full remote object
1218 - - push: only check same_remote when needed
1219 - - push: remove trivial function
1220 - - push: remove redundant check
1221 - - push: factor out the typical case
1222 - - push: get rid of all the setup_push_* functions
1223 - - push: trivial simplifications
1224 - - push: make setup_push_* return the dst
1225 - - push: only get the branch when needed
1226 - - push: factor out null branch check
1227 - - push: split switch cases
1228 - - push: return immediately in trivial switch case
1229 - - push: create new get_upstream_ref() helper
1244 + (merged to 'next' on 2021-07-06 at da7fab5dc4)
1245 + + push: don't get a full remote object
1246 + + push: only check same_remote when needed
1247 + + push: remove trivial function
1248 + + push: remove redundant check
1249 + + push: factor out the typical case
1250 + + push: get rid of all the setup_push_* functions
1251 + + push: trivial simplifications
1252 + + push: make setup_push_* return the dst
1253 + + push: only get the branch when needed
1254 + + push: factor out null branch check
1255 + + push: split switch cases
1256 + + push: return immediately in trivial switch case
1257 + + push: create new get_upstream_ref() helper
1258 (this branch uses fc/push-simple-updates.)
1259
1260 Some more code and doc clarification around "git push".
1261
1234 - Will merge to 'next'.
1235 -
1236 -
1237 -* tb/complete-diff-anchored (2021-05-31) 1 commit
1238 - (merged to 'next' on 2021-07-01 at 19878daaa9)
1239 - + completion: add --anchored to diff's options
1240 -
1241 - The command line completion (in contrib/) learned that "git diff"
1242 - takes the "--anchored" option.
1243 -
1262 Will merge to 'master'.
1263
1264
1265 * en/ort-perf-batch-12 (2021-06-09) 4 commits
1248 - - merge-ort: miscellaneous touch-ups
1249 - - Fix various issues found in comments
1250 - - diffcore-rename: avoid unnecessary strdup'ing in break_idx
1251 - - merge-ort: replace string_list_df_name_compare with faster alternative
1266 + (merged to 'next' on 2021-07-08 at 4807694598)
1267 + + merge-ort: miscellaneous touch-ups
1268 + + Fix various issues found in comments
1269 + + diffcore-rename: avoid unnecessary strdup'ing in break_idx
1270 + + merge-ort: replace string_list_df_name_compare with faster alternative
1271
1272 More fix-ups and optimization to "merge -sort".
1273
1255 - Will merge to 'next'.
1274 + Will merge to 'master'.
1275
1276
1277 * zh/ref-filter-raw-data (2021-07-01) 16 commits
@@ -1278,6 +1297,7 @@ Release tarballs are available at:
1297 option of "git for-each-ref" and its friends to be used in "git
1298 cat-file --batch".
1299
1300 + Heavy performance degradation has been observed with this series.
1301
1302
1303 * jh/builtin-fsmonitor (2021-07-01) 34 commits
@@ -1328,27 +1348,29 @@ Release tarballs are available at:
1348 trace2 logs learned to show parent process name to see in what
1349 context Git was invoked.
1350
1331 - Will merge to 'next'?
1351 + Expecting a reroll.
1352 + cf. <YNux62he9Mk43Y1B@google.com>
1353
1354
1355 * ab/send-email-optim (2021-05-28) 13 commits
1335 - - perl: nano-optimize by replacing Cwd::cwd() with Cwd::getcwd()
1336 - - send-email: move trivial config handling to Perl
1337 - - perl: lazily load some common Git.pm setup code
1338 - - send-email: lazily load modules for a big speedup
1339 - - send-email: get rid of indirect object syntax
1340 - - send-email: use function syntax instead of barewords
1341 - - send-email: lazily shell out to "git var"
1342 - - send-email: lazily load config for a big speedup
1343 - - send-email: copy "config_regxp" into git-send-email.perl
1344 - - send-email: refactor sendemail.smtpencryption config parsing
1345 - - send-email: remove non-working support for "sendemail.smtpssl"
1346 - - send-email tests: test for boolean variables without a value
1347 - - send-email tests: support GIT_TEST_PERL_FATAL_WARNINGS=true
1356 + (merged to 'next' on 2021-07-08 at 35ac315894)
1357 + + perl: nano-optimize by replacing Cwd::cwd() with Cwd::getcwd()
1358 + + send-email: move trivial config handling to Perl
1359 + + perl: lazily load some common Git.pm setup code
1360 + + send-email: lazily load modules for a big speedup
1361 + + send-email: get rid of indirect object syntax
1362 + + send-email: use function syntax instead of barewords
1363 + + send-email: lazily shell out to "git var"
1364 + + send-email: lazily load config for a big speedup
1365 + + send-email: copy "config_regxp" into git-send-email.perl
1366 + + send-email: refactor sendemail.smtpencryption config parsing
1367 + + send-email: remove non-working support for "sendemail.smtpssl"
1368 + + send-email tests: test for boolean variables without a value
1369 + + send-email tests: support GIT_TEST_PERL_FATAL_WARNINGS=true
1370
1371 "git send-email" optimization.
1372
1351 - Will merge to 'next'.
1373 + Will merge to 'master'.
1374
1375
1376 * ab/fsck-unexpected-type (2021-06-28) 21 commits
@@ -1377,141 +1399,4 @@ Release tarballs are available at:
1399 "git fsck" has been taught to report mismatch between expected and
1400 actual types of an object better.
1401
1380 ---------------------------------------------------
1381 -[Will Discard]
1382 -
1383 -* ag/merge-strategies-in-c (2021-03-17) 15 commits
1384 - . sequencer: use the "octopus" merge strategy without forking
1385 - . sequencer: use the "resolve" strategy without forking
1386 - . merge: use the "octopus" strategy without forking
1387 - . merge: use the "resolve" strategy without forking
1388 - . merge-octopus: rewrite in C
1389 - . merge-recursive: move better_branch_name() to merge.c
1390 - . merge-resolve: rewrite in C
1391 - . merge-one-file: rewrite in C
1392 - . update-index: move add_cacheinfo() to read-cache.c
1393 - . merge-index: add a new way to invoke `git-merge-one-file'
1394 - . merge-index: drop the index
1395 - . merge-index: libify merge_one_path() and merge_all()
1396 - . t6060: add tests for removed files
1397 - . t6060: modify multiple files to expose a possible issue with merge-index
1398 - . t6407: modernise tests
1399 -
1400 - The resolve and octopus merge strategy backends have been rewritten
1401 - in C.
1402 -
1403 - Will discard.
1404 - We had to wait for a reroll for too long.
1405 - cf. <nycvar.QRO.7.76.6.2103241142220.50@tvgsbejvaqbjf.bet>
1406 -
1407 -
1408 -* mr/bisect-in-c-4 (2021-04-11) 4 commits
1409 - . bisect--helper: retire `--bisect-next-check` subcommand
1410 - . bisect--helper: reimplement `bisect_run` shell function in C
1411 - . bisect--helper: reimplement `bisect_visualize()`shell function in C
1412 - . run-command: make `exists_in_PATH()` non-static
1413 -
1414 - The codepaths involved in running "git bisect visualize" and "git
1415 - bisect run" has been rewritten in C.
1416 -
1417 - Will discard.
1418 - We had to wait for a reroll for too long.
1419 - cf. <xmqq35vwh8qk.fsf@gitster.g>, <xmqqy2doftrj.fsf@gitster.g>,
1420 - <CAP8UFD3X24F3qgefHpi00PM-KUk+vcqxwy2Dbngbyj7ciavCVQ@mail.gmail.com>
1421 - May want to boost the test coverage.
1422 -
1423 -
1424 -* ma/t0091-bugreport-fix (2021-04-12) 1 commit
1425 - . t0091-bugreport.sh: actually verify some content of report
1426 -
1427 - Test fix.
1428 -
1429 - Will discard.
1430 - We had to wait for a reroll for too long.
1431 - Expecting a reroll.
1432 - cf. <YHYZTLl90rkWWVOr@google.com>, <87a6q22dei.fsf@evledraar.gmail.com>
1433 -
1434 -
1435 -* ls/fast-export-signed (2021-05-03) 5 commits
1436 - . fast-export, fast-import: add support for signed-commits
1437 - . fast-export: do not modify memory from get_commit_buffer
1438 - . git-fast-export.txt: clarify why 'verbatim' may not be a good idea
1439 - . fast-export: rename --signed-tags='warn' to 'warn-verbatim'
1440 - . git-fast-import.txt: add missing LF in the BNF
1441 -
1442 - "git fast-export" offers a way to control how signed tags are
1443 - handled; the mechanism has been extended to allow specifying how
1444 - signed commits are handled as well.
1445 -
1446 - Will discard.
1447 - We had to wait for a reroll for too long.
1448 - cf. <xmqqa6pca0pv.fsf@gitster.g>, <xmqq1rao9zev.fsf@gitster.g>
1449 -
1450 -
1451 -* fc/neuter-doc (2021-06-14) 2 commits
1452 - . comments: avoid using the gender of our users
1453 - . doc: avoid using the gender of other people
1454 -
1455 - An attempt to avoid gendered pronouns by rewriting parts of docs.
1456 -
1457 - This seems to give more readable result than Stolee's "use singular
1458 - they" topic.
1459 -
1460 - Will discard.
1461 - Now is a part of the ds/gender-neutral-doc topic.
1462 -
1463 -
1464 -* es/config-based-hooks (2021-05-27) 37 commits
1465 - . docs: link githooks and git-hook manpages
1466 - . doc: clarify fsmonitor-watchman specification
1467 - . run-command: stop thinking about hooks
1468 - . git-send-email: use 'git hook run' for 'sendemail-validate'
1469 - . bugreport: use hook_exists instead of find_hook
1470 - . receive-pack: convert receive hooks to hook.h
1471 - . post-update: use hook.h library
1472 - . proc-receive: acquire hook list from hook.h
1473 - . receive-pack: convert 'update' hook to hook.h
1474 - . reference-transaction: look for hooks in config
1475 - . transport: convert pre-push hook to use config
1476 - . hook: convert 'post-rewrite' hook to config
1477 - . hooks: convert 'post-checkout' hook to hook library
1478 - . git-p4: use 'git hook' to run hooks
1479 - . receive-pack: convert push-to-checkout hook to hook.h
1480 - . read-cache: convert post-index-change hook to use config
1481 - . rebase: teach pre-rebase to use hook.h
1482 - . gc: use hook library for pre-auto-gc hook
1483 - . merge: use config-based hooks for post-merge hook
1484 - . am: convert applypatch hooks to use config
1485 - . commit: use config-based hooks
1486 - . hooks: allow callers to capture output
1487 - . run-command: allow capturing of collated output
1488 - . hook: provide stdin by string_list or callback
1489 - . run-command: add stdin callback for parallelization
1490 - . hook: allow specifying working directory for hooks
1491 - . hook: allow parallel hook execution
1492 - . run-command: allow stdin for run_processes_parallel
1493 - . hook: support passing stdin to hooks
1494 - . hook: introduce hook_exists()
1495 - . hook: add 'run' subcommand
1496 - . parse-options: parse into strvec
1497 - . hook: implement hookcmd.<name>.skip
1498 - . hook: teach hook.runHookDir
1499 - . hook: include hookdir hook in list
1500 - . hook: introduce git-hook subcommand
1501 - . doc: propose hooks managed by the config
1502 -
1503 - Propose hook scripts defined in the configuration.
1504 -
1505 - Will discard.
1506 - ab/config-based-hooks-base refactors the preparatory part so that
1507 - the new feature in this topic can be rebased on top.
1508 -
1509 -
1510 -* bc/doc-asciidoctor-to-man-wo-xmlto (2021-05-14) 2 commits
1511 - . doc: remove GNU_ROFF option
1512 - . doc: add an option to have Asciidoctor build man pages directly
1513 -
1514 - An option to render the manual pages via AsciiDoctor bypassing
1515 - xmlto has been introduced.
1516 -
1517 - Will discard.
1402 + Needs review.