What's cooking (2020/08) #07

Junio C Hamano committed Aug 27, 2020 at 14:33 UTC b355891ff6d73029bfe91f43b74824bfdeee78f6
1 file changed +276 -273
whats-cooking.txt
+276 -273
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Aug 2020, #06; Mon, 24)
4 -X-master-at: e9b77c84a0a0df029f2a3a8114e9f22186e7da24
5 -X-next-at: 40977abb4059c11004726852a79df64f4553944d
3 +Subject: What's cooking in git.git (Aug 2020, #07; Thu, 27)
4 +X-master-at: 20de7e7e4f4e9ae52e6cc7cfaa6469f186ddb0fa
5 +X-next-at: e36021eeeff56bc9a7afbe027201c2c7f8603545
6
7 -What's cooking in git.git (Aug 2020, #06; Mon, 24)
7 +What's cooking in git.git (Aug 2020, #07; Thu, 27)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -20,169 +20,208 @@ repositories listed at
20 --------------------------------------------------
21 [Graduated to 'master']
22
23 -* dl/subtree-docs (2020-08-18) 2 commits
24 - (merged to 'next' on 2020-08-19 at e1a8ea9d46)
25 - + contrib/subtree: document 'push' does not take '--squash'
26 - + contrib/subtree: fix "unsure" for --message in the document
23 +* en/mem-pool (2020-08-18) 3 commits
24 + (merged to 'next' on 2020-08-19 at eff9ad46f0)
25 + + mem-pool: use consistent pool variable name
26 + + mem-pool: use more standard initialization and finalization
27 + + mem-pool: add convenience functions for strdup and strndup
28
28 - Doc updates for subtree (in contrib/)
29 + API update.
30
31
31 -* ds/midx-repack-to-batch-size (2020-08-11) 1 commit
32 - (merged to 'next' on 2020-08-17 at eee94634aa)
33 - + multi-pack-index: repack batches below --batch-size
32 +* hn/refs-fetch-head-is-special (2020-08-19) 4 commits
33 + (merged to 'next' on 2020-08-21 at def233ab43)
34 + + refs: read FETCH_HEAD and MERGE_HEAD generically
35 + + refs: move gitdir into base ref_store
36 + + refs: fix comment about submodule ref_stores
37 + + refs: split off reading loose ref data in separate function
38 + (this branch is used by hn/refs-pseudorefs.)
39
35 - The "--batch-size" option of "git multi-pack-index repack" command
36 - is now used to specify that very small packfiles are collected into
37 - one until the total size roughly exceeds it.
40 + The FETCH_HEAD is now always read from the filesystem regardless of
41 + the ref backend in use, as its format is much richer than the
42 + normal refs, and written directly by "git fetch" as a plain file..
43
44
40 -* en/dir-clear (2020-08-18) 2 commits
41 - (merged to 'next' on 2020-08-19 at 18c5b69293)
42 - + dir: fix problematic API to avoid memory leaks
43 - + dir: make clear_directory() free all relevant memory
45 +* jk/leakfix (2020-08-17) 7 commits
46 + (merged to 'next' on 2020-08-21 at a8b25a2657)
47 + + submodule--helper: fix leak of core.worktree value
48 + + config: fix leak in git_config_get_expiry_in_days()
49 + + config: drop git_config_get_string_const()
50 + + config: fix leaks from git_config_get_string_const()
51 + + checkout: fix leak of non-existent branch names
52 + + submodule--helper: use strbuf_release() to free strbufs
53 + + clear_pattern_list(): clear embedded hashmaps
54
45 - Leakfix with code clean-up.
55 + Code clean-up.
56
57
48 -* en/dir-nonbare-embedded (2020-08-12) 2 commits
49 - (merged to 'next' on 2020-08-17 at ab180b7fcb)
50 - + dir: avoid prematurely marking nonbare repositories as matches
51 - + t3000: fix some test description typos
58 +* rz/complete-more-options (2020-08-19) 2 commits
59 + (merged to 'next' on 2020-08-21 at ba8f4c8cb1)
60 + + completion: add GIT_COMPLETION_SHOW_ALL env var
61 + + parse-options: add --git-completion-helper-all
62
53 - "ls-files -o" mishandled the top-level directory of another git
54 - working tree that hangs in the current git working tree.
63 + Command line completion (in contrib/) usually omits redundant,
64 + deprecated and/or dangerous options from its output; it learned to
65 + optionally include all of them.
66
67 +--------------------------------------------------
68 +[New Topics]
69
57 -* es/init-no-separate-git-dir-in-bare (2020-08-10) 1 commit
58 - (merged to 'next' on 2020-08-17 at 80498c8659)
59 - + init: disallow --separate-git-dir with bare repository
70 +* jc/remove-pack-redundant (2020-08-25) 1 commit
71 + - pack-redundant: gauge the usage before proposing its removal
72
61 - The purpose of "git init --separate-git-dir" is to initialize a
62 - new project with the repository separate from the working tree,
63 - or, in the case of an existing project, to move the repository
64 - (the .git/ directory) out of the working tree. It does not make
65 - sense to use --separate-git-dir with a bare repository for which
66 - there is no working tree, so disallow its use with bare
67 - repositories.
73 + The first step to remove "git pack-redundant" by soliciting
74 + objections.
75
76
70 -* jc/no-update-fetch-head (2020-08-18) 1 commit
71 - (merged to 'next' on 2020-08-19 at 68e1374ed6)
72 - + fetch: optionally allow disabling FETCH_HEAD update
73 - (this branch is used by ds/maintenance-part-1, ds/maintenance-part-2 and jt/lazy-fetch.)
77 +* ps/ref-transaction-hook (2020-08-25) 1 commit
78 + (merged to 'next' on 2020-08-27 at 49b3fb8349)
79 + + refs: remove lookup cache for reference-transaction hook
80
75 - "git fetch" learned --no-write-fetch-head option to avoid writing
76 - the FETCH_HEAD file.
81 + Code simplification by removing ineffective optimization.
82
83 + Will merge to 'master'.
84
79 -* jk/unleak-fixes (2020-08-13) 2 commits
80 - (merged to 'next' on 2020-08-17 at f9bd296b25)
81 - + ls-remote: simplify UNLEAK() usage
82 - + stop calling UNLEAK() before die()
85
84 - Fix some incorrect UNLEAK() annotations.
86 +* jc/undash-in-tree-git-callers (2020-08-27) 3 commits
87 + (merged to 'next' on 2020-08-27 at 671fa2f87e)
88 + + credential-cache: use child_process.args
89 + + cvsexportcommit: do not run git programs in dashed form
90 + + transport-helper: do not run git-remote-ext etc. in dashed form
91 + (this branch is used by jc/war-on-dashed-git.)
92
93 + A handful of places in in-tree code still relied on being able to
94 + execute the git subcommands, especially built-ins, in "git-foo"
95 + form, which have been corrected.
96
87 -* ma/doc-sha-256-is-experimental (2020-08-17) 1 commit
88 - (merged to 'next' on 2020-08-19 at 9ccf6c399c)
89 - + Documentation: mark `--object-format=sha256` as experimental
97 + Will merge to 'master'.
98
91 - The recent addition of SHA-256 support is marked as experimental in
92 - the documentation.
99
100 +* jc/war-on-dashed-git (2020-08-27) 1 commit
101 + - git: catch an attempt to run "git-foo"
102 + (this branch uses jc/undash-in-tree-git-callers.)
103
95 -* mt/checkout-entry-dead-code-removal (2020-08-18) 1 commit
96 - (merged to 'next' on 2020-08-19 at 58866e5299)
97 - + checkout_entry(): remove unreachable error() call
104 + The first step to remove on-disk binaries for built-in subcommands
105 + by soliciting objections.
106
99 - Code clean-up.
107 + On hold for now.
108
109
102 -* rs/more-buffered-io (2020-08-17) 3 commits
103 - (merged to 'next' on 2020-08-19 at 6d23a23bb2)
104 - + upload-pack: use buffered I/O to talk to rev-list
105 - + midx: use buffered I/O to talk to pack-objects
106 - + connected: use buffered I/O to talk to rev-list
110 +* jk/rev-input-given-fix (2020-08-26) 1 commit
111 + (merged to 'next' on 2020-08-27 at da291a327c)
112 + + revision: set rev_input_given in handle_revision_arg()
113
108 - Use more buffered I/O where we used to call many small write(2)s.
114 + Feeding "$ZERO_OID" to "git log --ignore-missing --stdin", and
115 + running "git log --ignore-missing $ZERO_OID" fell back to start
116 + digging from HEAD; it has been corrected to become a no-op, like
117 + "git log --tags=no-tag-matches-this-pattern" does.
118
119 + Will merge to 'master'.
120
111 -* rs/patch-id-with-incomplete-line (2020-08-18) 1 commit
112 - (merged to 'next' on 2020-08-19 at 72961d48d0)
113 - + patch-id: ignore newline at end of file in diff_flush_patch_id()
121
115 - The patch-id computation did not ignore the "incomplete last line"
116 - marker like whitespaces.
122 +* tb/repack-clearing-midx (2020-08-26) 1 commit
123 + (merged to 'next' on 2020-08-27 at a465875cbb)
124 + + builtin/repack.c: invalidate MIDX only when necessary
125
118 ---------------------------------------------------
119 -[New Topics]
126 + When a packfile is removed by "git repack", multi-pack-index gets
127 + cleared; the code was taught to do so less aggressively by first
128 + checking if the midx actually refers to a pack that no longer
129 + exists.
130
121 -* jk/refspecs-cleanup (2020-08-17) 2 commits
122 - (merged to 'next' on 2020-08-24 at 807a080ebf)
123 - + refspec: make sure stack refspec_item variables are zeroed
124 - + refspec: fix documentation referring to refspec_item
125 - (this branch is used by jk/refspecs-negative.)
131 + Will merge to 'master'.
132
127 - Preliminary code clean-up before introducing "negative refspec".
133 +
134 +* jc/run-command-use-embedded-args (2020-08-26) 1 commit
135 + (merged to 'next' on 2020-08-27 at c2b688e8e9)
136 + + run_command: teach API users to use embedded 'args' more
137 +
138 + Various callers of run_command API has been modernized.
139
140 Will merge to 'master'.
141
142
132 -* rs/checkout-no-overlay-pathspec-fix (2020-08-22) 1 commit
133 - - checkout, restore: make pathspec recursive
143 +* es/worktree-repair (2020-08-27) 5 commits
144 + - init: make --separate-git-dir work from within linked worktree
145 + - init: teach --separate-git-dir to repair linked worktrees
146 + - worktree: teach "repair" to fix outgoing links to worktrees
147 + - worktree: teach "repair" to fix worktree back-links to main worktree
148 + - worktree: add skeleton "repair" command
149
135 - "git restore/checkout --no-overlay" with wildcarded pathspec
136 - mistakenly removed matching paths in subdirectories, which has been
137 - corrected.
150 + "git worktree repair" command to correct on-disk pointers between
151 + the repository and its secondary working trees.
152
139 - Will merge to 'next'.
153 + Expecting a reroll.
154
155
142 -* al/bisect-first-parent (2020-08-22) 1 commit
143 - (merged to 'next' on 2020-08-24 at f95fbf45a6)
144 - + bisect: add first-parent option to documentation
156 +* jk/worktree-check-clean-leakfix (2020-08-27) 1 commit
157 + - worktree: fix leak in check_clean_worktree()
158
146 - Finishing touches.
159 + Leakfix.
160
148 - Will merge to 'master'.
161 + Will merge to 'next'.
162
163
151 -* js/no-builtins-on-disk-option (2020-08-24) 3 commits
152 - - ci: stop linking built-ins to the dashed versions
153 - - install: optionally skip linking/copying the built-ins
154 - - msvc: copy the correct `.pdb` files in the Makefile target `install`
164 +* so/pretty-abbrev-doc (2020-08-27) 1 commit
165 + - pretty-options.txt: fix --no-abbrev-commit description
166
156 - The installation procedure learned to optionally omit "git-foo"
157 - executable files for each 'foo' built-in subcommand, which are only
158 - required by old timers that still rely on the age old promise that
159 - prepending "git --exec-path" output to PATH early in their script
160 - will keep the "git-foo" calls they wrote working.
167 + Documentation update for "--no-abbrev-commit".
168
162 - The old attempt to remove these executables from the disk failed in
163 - the 1.6 era; it may be worth attempting again, but I think it is
164 - worth to keep this topic separate from such a policy change to help
165 - it graduate early.
169 + Will merge to 'next'.
170
167 - cf. https://public-inbox.org/git/7vprnzt7d5.fsf@gitster.siamese.dyndns.org/
171
172 +* ss/submodule-summary-in-c-fixes (2020-08-27) 3 commits
173 + - t7421: eliminate 'grep' check in t7421.4 for mingw compatibility
174 + - submodule: fix style in function definition
175 + - submodule: eliminate unused parameters from print_submodule_summary()
176 + (this branch uses ss/submodule-summary-in-c.)
177
170 -* jt/threaded-index-pack (2020-08-24) 8 commits
171 - - fixup! index-pack: make quantum of work smaller
172 - - index-pack: make quantum of work smaller
173 - - index-pack: make resolve_delta() assume base data
174 - - index-pack: calculate {ref,ofs}_{first,last} early
175 - - index-pack: remove redundant child field
176 - - index-pack: unify threaded and unthreaded code
177 - - index-pack: remove redundant parameter
178 - - Documentation: deltaBaseCacheLimit is per-thread
178 + Fixups to a topic in 'next'.
179
180 - "git index-pack" learned to resolve deltified objects with greater
181 - parallelism.
180 + Will merge to 'next'.
181
182 --------------------------------------------------
183 [Stalled]
184
185 +* tb/bloom-improvements (2020-08-11) 14 commits
186 + - builtin/commit-graph.c: introduce '--max-new-filters=<n>'
187 + - commit-graph: rename 'split_commit_graph_opts'
188 + - commit-graph: add large-filters bitmap chunk
189 + - commit-graph.c: sort index into commits list
190 + - bloom/diff: properly short-circuit on max_changes
191 + - bloom: use provided 'struct bloom_filter_settings'
192 + - csum-file.h: introduce 'hashwrite_be64()'
193 + - bloom: split 'get_bloom_filter()' in two
194 + - commit-graph.c: store maximum changed paths
195 + - commit-graph: respect 'commitGraph.readChangedPaths'
196 + - t/helper/test-read-graph.c: prepare repo settings
197 + - commit-graph: pass a 'struct repository *' in more places
198 + - t4216: use an '&&'-chain
199 + - commit-graph: introduce 'get_bloom_filter_settings()'
200 +
201 + Misc Bloom filter improvements.
202 +
203 + Expecting a reroll.
204 + It seems that the review is getting closer to result in another update.
205 + cf. <20200811220503.GC66656@syl.lan>
206 +
207 +
208 +* es/config-hooks (2020-07-30) 6 commits
209 + - hook: add 'run' subcommand
210 + - parse-options: parse into argv_array
211 + - hook: add --porcelain to list command
212 + - hook: add list command
213 + - hook: scaffolding for git-hook subcommand
214 + - doc: propose hooks managed by the config
215 +
216 + The "hooks defined in config" topic.
217 +
218 + Expecting a reroll.
219 + Now jk/strvec is in 'master', we may want to see the topic reworked
220 + on top of it. Are there unresolved issues, or does the topic need
221 + a round of detailed review?
222 + cf. <xmqqmu3i9kvg.fsf@gitster.c.googlers.com>
223 +
224 +
225 * mt/grep-sparse-checkout (2020-06-12) 6 commits
226 - config: add setting to ignore sparsity patterns in some cmds
227 - grep: honor sparse checkout patterns
@@ -266,13 +305,77 @@ repositories listed at
305 --------------------------------------------------
306 [Cooking]
307
308 +* jk/refspecs-cleanup (2020-08-17) 2 commits
309 + (merged to 'next' on 2020-08-24 at 807a080ebf)
310 + + refspec: make sure stack refspec_item variables are zeroed
311 + + refspec: fix documentation referring to refspec_item
312 + (this branch is used by jk/refspecs-negative.)
313 +
314 + Preliminary code clean-up before introducing "negative refspec".
315 +
316 + Will merge to 'master'.
317 +
318 +
319 +* rs/checkout-no-overlay-pathspec-fix (2020-08-22) 1 commit
320 + (merged to 'next' on 2020-08-27 at 277e39346d)
321 + + checkout, restore: make pathspec recursive
322 +
323 + "git restore/checkout --no-overlay" with wildcarded pathspec
324 + mistakenly removed matching paths in subdirectories, which has been
325 + corrected.
326 +
327 + Will merge to 'master'.
328 +
329 +
330 +* al/bisect-first-parent (2020-08-22) 1 commit
331 + (merged to 'next' on 2020-08-24 at f95fbf45a6)
332 + + bisect: add first-parent option to documentation
333 +
334 + Finishing touches.
335 +
336 + Will merge to 'master'.
337 +
338 +
339 +* js/no-builtins-on-disk-option (2020-08-24) 3 commits
340 + - ci: stop linking built-ins to the dashed versions
341 + - install: optionally skip linking/copying the built-ins
342 + - msvc: copy the correct `.pdb` files in the Makefile target `install`
343 +
344 + The installation procedure learned to optionally omit "git-foo"
345 + executable files for each 'foo' built-in subcommand, which are only
346 + required by old timers that still rely on the age old promise that
347 + prepending "git --exec-path" output to PATH early in their script
348 + will keep the "git-foo" calls they wrote working.
349 +
350 + The old attempt to remove these executables from the disk failed in
351 + the 1.6 era; it may be worth attempting again, but I think it is
352 + worth to keep this topic separate from such a policy change to help
353 + it graduate early.
354 +
355 + cf. https://public-inbox.org/git/7vprnzt7d5.fsf@gitster.siamese.dyndns.org/
356 +
357 +
358 +* jt/threaded-index-pack (2020-08-27) 9 commits
359 + - builtin/index-pack.c: fix some sparse warnings
360 + - fixup! index-pack: make quantum of work smaller
361 + - index-pack: make quantum of work smaller
362 + - index-pack: make resolve_delta() assume base data
363 + - index-pack: calculate {ref,ofs}_{first,last} early
364 + - index-pack: remove redundant child field
365 + - index-pack: unify threaded and unthreaded code
366 + - index-pack: remove redundant parameter
367 + - Documentation: deltaBaseCacheLimit is per-thread
368 +
369 + "git index-pack" learned to resolve deltified objects with greater
370 + parallelism.
371 +
372 +
373 * hn/refs-pseudorefs (2020-08-21) 4 commits
374 (merged to 'next' on 2020-08-24 at 3579abe8ff)
375 + sequencer: treat REVERT_HEAD as a pseudo ref
376 + builtin/commit: suggest update-ref for pseudoref removal
377 + sequencer: treat CHERRY_PICK_HEAD as a pseudo ref
378 + refs: make refs_ref_exists public
275 - (this branch uses hn/refs-fetch-head-is-special.)
379
380 Accesses to two pseudorefs have been updated to properly use ref
381 API.
@@ -280,18 +383,6 @@ repositories listed at
383 Will merge to 'master'.
384
385
283 -* rz/complete-more-options (2020-08-19) 2 commits
284 - (merged to 'next' on 2020-08-21 at ba8f4c8cb1)
285 - + completion: add GIT_COMPLETION_SHOW_ALL env var
286 - + parse-options: add --git-completion-helper-all
287 -
288 - Command line completion (in contrib/) usually omits redundant,
289 - deprecated and/or dangerous options from its output; it learned to
290 - optionally include all of them.
291 -
292 - Will merge to 'master'.
293 -
294 -
386 * jt/promisor-pack-fix (2020-08-20) 1 commit
387 (merged to 'next' on 2020-08-24 at cd26d30d8d)
388 + fetch-pack: in partial clone, pass --promisor
@@ -316,11 +407,12 @@ repositories listed at
407
408
409 * jc/ident-whose-ident (2020-08-21) 1 commit
319 - - ident: say whose identity is missing when giving user.name hint
410 + (merged to 'next' on 2020-08-27 at caf5149c28)
411 + + ident: say whose identity is missing when giving user.name hint
412
413 Error message update.
414
323 - Will merge to 'next'.
415 + Will merge to 'master'.
416
417
418 * jk/index-pack-w-more-threads (2020-08-21) 3 commits
@@ -336,12 +428,13 @@ repositories listed at
428
429
430 * rp/apply-cached-doc (2020-08-20) 1 commit
339 - - git-apply.txt: update descriptions of --cached, --index
431 + (merged to 'next' on 2020-08-27 at 1d610f08ea)
432 + + git-apply.txt: update descriptions of --cached, --index
433
434 The description of --cached/--index options in "git apply --help"
435 has been updated.
436
344 - Will merge to 'next'.
437 + Will merge to 'master'.
438
439
440 * dd/diff-customize-index-line-abbrev (2020-08-21) 2 commits
@@ -356,51 +449,22 @@ repositories listed at
449 Will merge to 'master'.
450
451
359 -* hn/refs-fetch-head-is-special (2020-08-19) 4 commits
360 - (merged to 'next' on 2020-08-21 at def233ab43)
361 - + refs: read FETCH_HEAD and MERGE_HEAD generically
362 - + refs: move gitdir into base ref_store
363 - + refs: fix comment about submodule ref_stores
364 - + refs: split off reading loose ref data in separate function
365 - (this branch is used by hn/refs-pseudorefs.)
366 -
367 - The FETCH_HEAD is now always read from the filesystem regardless of
368 - the ref backend in use, as its format is much richer than the
369 - normal refs, and written directly by "git fetch" as a plain file..
370 -
371 - Will merge to 'master'.
372 -
373 -
452 * hv/ref-filter-misc (2020-08-17) 9 commits
375 - - ref-filter: add `sanitize` option for 'subject' atom
376 - - format-support: move `format_sanitized_subject()` from pretty
377 - - pretty: refactor `format_sanitized_subject()`
378 - - ref-filter: add `short` modifier to 'parent' atom
379 - - ref-filter: add `short` modifier to 'tree' atom
380 - - ref-filter: rename `objectname` related functions and fields
381 - - ref-filter: modify error messages in `grab_objectname()`
382 - - ref-filter: refactor `grab_objectname()`
383 - - ref-filter: support different email formats
453 + (merged to 'next' on 2020-08-27 at c015fa6b0f)
454 + + ref-filter: add `sanitize` option for 'subject' atom
455 + + format-support: move `format_sanitized_subject()` from pretty
456 + + pretty: refactor `format_sanitized_subject()`
457 + + ref-filter: add `short` modifier to 'parent' atom
458 + + ref-filter: add `short` modifier to 'tree' atom
459 + + ref-filter: rename `objectname` related functions and fields
460 + + ref-filter: modify error messages in `grab_objectname()`
461 + + ref-filter: refactor `grab_objectname()`
462 + + ref-filter: support different email formats
463
464 The "--format=" option to the "for-each-ref" command and friends
465 learned a few more tricks, e.g. the ":short" suffix that applies to
466 "objectname" now also can be used for "parent", "tree", etc.
467
389 - Will merge to 'next'.
390 -
391 -
392 -* jk/leakfix (2020-08-17) 7 commits
393 - (merged to 'next' on 2020-08-21 at a8b25a2657)
394 - + submodule--helper: fix leak of core.worktree value
395 - + config: fix leak in git_config_get_expiry_in_days()
396 - + config: drop git_config_get_string_const()
397 - + config: fix leaks from git_config_get_string_const()
398 - + checkout: fix leak of non-existent branch names
399 - + submodule--helper: use strbuf_release() to free strbufs
400 - + clear_pattern_list(): clear embedded hashmaps
401 -
402 - Code clean-up.
403 -
468 Will merge to 'master'.
469
470
@@ -411,59 +475,54 @@ repositories listed at
475 "negative refspecs"
476
477
414 -* jt/fetch-pack-loosen-validation-with-packfile-uri (2020-08-14) 1 commit
415 - - fetch-pack: make packfile URIs work with transfer.fsckobjects
478 +* jt/fetch-pack-loosen-validation-with-packfile-uri (2020-08-24) 3 commits
479 + (merged to 'next' on 2020-08-27 at efd171f172)
480 + + fetch-pack: make packfile URIs work with transfer.fsckobjects
481 + + fetch-pack: document only_packfile in get_pack()
482 + + (various): document from_promisor parameter
483
484 Bugfix for "git fetch" when the packfile URI capability is in use.
485
419 - Need to pick up a reroll.
486 + Will merge to 'master'.
487
488
489 * mr/diff-hide-stat-wo-textual-change (2020-08-19) 1 commit
423 - - diff: teach --stat to ignore uninteresting modifications
490 + (merged to 'next' on 2020-08-27 at b9e97254ae)
491 + + diff: teach --stat to ignore uninteresting modifications
492
493 "git diff --stat -w" showed 0-line changes for paths whose changes
494 were only whitespaces, which was not intuitive. We now omit such
495 paths from the stat output.
496
429 - Will merge to 'next'.
497 + Will merge to 'master'.
498
499
500 * pw/add-p-allowed-options-fix (2020-08-17) 2 commits
433 - - add -p: fix checking of user input
434 - - add -p: use ALLOC_GROW_BY instead of ALLOW_GROW
501 + (merged to 'next' on 2020-08-27 at 6cd62753f7)
502 + + add -p: fix checking of user input
503 + + add -p: use ALLOC_GROW_BY instead of ALLOW_GROW
504
505 "git add -p" update.
506
438 - Will merge to 'next'.
439 -
440 -
441 -* en/mem-pool (2020-08-18) 3 commits
442 - (merged to 'next' on 2020-08-19 at eff9ad46f0)
443 - + mem-pool: use consistent pool variable name
444 - + mem-pool: use more standard initialization and finalization
445 - + mem-pool: add convenience functions for strdup and strndup
446 -
447 - API update.
448 -
507 Will merge to 'master'.
508
509
510 * jt/lazy-fetch (2020-08-18) 7 commits
453 - - fetch-pack: remove no_dependents code
454 - - promisor-remote: lazy-fetch objects in subprocess
455 - - fetch-pack: do not lazy-fetch during ref iteration
456 - - fetch: only populate existing_refs if needed
457 - - fetch: avoid reading submodule config until needed
458 - - fetch: allow refspecs specified through stdin
459 - - negotiator/noop: add noop fetch negotiator
511 + (merged to 'next' on 2020-08-27 at 85f2319ba1)
512 + + fetch-pack: remove no_dependents code
513 + + promisor-remote: lazy-fetch objects in subprocess
514 + + fetch-pack: do not lazy-fetch during ref iteration
515 + + fetch: only populate existing_refs if needed
516 + + fetch: avoid reading submodule config until needed
517 + + fetch: allow refspecs specified through stdin
518 + + negotiator/noop: add noop fetch negotiator
519
520 Updates to on-demand fetching code in lazily cloned repositories.
521
463 - Will merge to 'next'.
522 + Will merge to 'master'.
523
524
466 -* jx/proc-receive-hook (2020-08-24) 10 commits
525 +* jx/proc-receive-hook (2020-08-27) 10 commits
526 - doc: add documentation for the proc-receive hook
527 - transport: parse report options for tracking refs
528 - t5411: test updates of remote-tracking branches
@@ -478,8 +537,12 @@ repositories listed at
537 "git receive-pack" that accepts requests by "git push" learned to
538 outsource most of the ref updates to the new "proc-receive" hook.
539
540 + Looking good.
541 +
542
482 -* pw/rebase-i-more-options (2020-08-19) 5 commits
543 +* pw/rebase-i-more-options (2020-08-26) 6 commits
544 + (merged to 'next' on 2020-08-27 at c55cfeb247)
545 + + t3436: do not run git-merge-recursive in dashed form
546 (merged to 'next' on 2020-08-21 at ade71fd49b)
547 + rebase: add --reset-author-date
548 + rebase -i: support --ignore-date
@@ -492,54 +555,33 @@ repositories listed at
555 Will merge to 'master'.
556
557
495 -* tb/bloom-improvements (2020-08-11) 14 commits
496 - - builtin/commit-graph.c: introduce '--max-new-filters=<n>'
497 - - commit-graph: rename 'split_commit_graph_opts'
498 - - commit-graph: add large-filters bitmap chunk
499 - - commit-graph.c: sort index into commits list
500 - - bloom/diff: properly short-circuit on max_changes
501 - - bloom: use provided 'struct bloom_filter_settings'
502 - - csum-file.h: introduce 'hashwrite_be64()'
503 - - bloom: split 'get_bloom_filter()' in two
504 - - commit-graph.c: store maximum changed paths
505 - - commit-graph: respect 'commitGraph.readChangedPaths'
506 - - t/helper/test-read-graph.c: prepare repo settings
507 - - commit-graph: pass a 'struct repository *' in more places
508 - - t4216: use an '&&'-chain
509 - - commit-graph: introduce 'get_bloom_filter_settings()'
510 -
511 - Misc Bloom filter improvements.
512 -
513 - Expecting a reroll.
514 - It seems that the review is getting closer to result in another update.
515 - cf. <20200811220503.GC66656@syl.lan>
516 -
517 -
558 * jk/slimmed-down (2020-08-13) 5 commits
519 - - drop vcs-svn experiment
520 - - make git-fast-import a builtin
521 - - make git-bugreport a builtin
522 - - make credential helpers builtins
523 - - Makefile: drop builtins from MSVC pdb list
559 + (merged to 'next' on 2020-08-27 at bc8e9450c6)
560 + + drop vcs-svn experiment
561 + + make git-fast-import a builtin
562 + + make git-bugreport a builtin
563 + + make credential helpers builtins
564 + + Makefile: drop builtins from MSVC pdb list
565
566 Trim an unused binary and turn a bunch of commands into built-in.
567
527 - Will merge to 'next'.
568 + Will merge to 'master'.
569
570
571 * ss/t7401-modernize (2020-08-21) 5 commits
531 - - t7401: add a NEEDSWORK
532 - - t7401: change indentation for enhanced readability
533 - - t7401: change syntax of test_i18ncmp calls for clarity
534 - - t7401: use 'short' instead of 'verify' and cut in rev-parse calls
535 - - t7401: modernize style
572 + (merged to 'next' on 2020-08-27 at 516cba9c64)
573 + + t7401: add a NEEDSWORK
574 + + t7401: change indentation for enhanced readability
575 + + t7401: change syntax of test_i18ncmp calls for clarity
576 + + t7401: use 'short' instead of 'verify' and cut in rev-parse calls
577 + + t7401: modernize style
578
579 Test clean-up.
580
539 - Will merge to 'next'.
581 + Will merge to 'master'.
582
583
542 -* ds/maintenance-part-2 (2020-08-18) 8 commits
584 +* ds/maintenance-part-2 (2020-08-25) 8 commits
585 - maintenance: add incremental-repack auto condition
586 - maintenance: auto-size incremental-repack batch
587 - maintenance: add incremental-repack task
@@ -560,10 +602,11 @@ repositories listed at
602 + t7421: introduce a test script for verifying 'summary' output
603 + submodule: rename helper functions to avoid ambiguity
604 + submodule: remove extra line feeds between callback struct and macro
605 + (this branch is used by ss/submodule-summary-in-c-fixes.)
606
607 Yet another subcommand of "git submodule" is getting rewritten in C.
608
566 - Will merge to 'master'.
609 + Looking good.
610
611
612 * am/ci-wsfix (2020-08-21) 1 commit
@@ -575,7 +618,7 @@ repositories listed at
618 Will merge to 'master'.
619
620
578 -* ds/maintenance-part-1 (2020-08-18) 11 commits
621 +* ds/maintenance-part-1 (2020-08-25) 11 commits
622 - maintenance: add trace2 regions for task execution
623 - maintenance: add auto condition for commit-graph task
624 - maintenance: use pointers to check --auto
@@ -594,43 +637,3 @@ repositories listed at
637 cleaning.
638
639 Comments?
597 -
598 -
599 -* es/config-hooks (2020-07-30) 6 commits
600 - - hook: add 'run' subcommand
601 - - parse-options: parse into argv_array
602 - - hook: add --porcelain to list command
603 - - hook: add list command
604 - - hook: scaffolding for git-hook subcommand
605 - - doc: propose hooks managed by the config
606 -
607 - The "hooks defined in config" topic.
608 -
609 - Expecting a reroll.
610 - Now jk/strvec is in 'master', we may want to see the topic reworked
611 - on top of it. Are there unresolved issues, or does the topic need
612 - a round of detailed review?
613 - cf. <xmqqmu3i9kvg.fsf@gitster.c.googlers.com>
614 -
615 ---------------------------------------------------
616 -[Discarded]
617 -
618 -* rs/fast-export-anon-simplify (2020-08-13) 1 commit
619 - . fast-export: factor out print_oid()
620 -
621 - Code simplification.
622 -
623 - Retracted.
624 - cf. <6e2d4472-8293-4f10-0ba6-82ae83f7a465@web.de>
625 -
626 -
627 -* mt/hash-to-hex-thread-safety (2020-06-26) 2 commits
628 - . hex: make hash_to_hex_algop() and friends thread-safe
629 - . compat/win32/pthread: add pthread_once()
630 -
631 - hash_to_hex() used a set of rotating static buffers, which was not
632 - safe to use in a threaded environment. This has been made safer by
633 - using thread-local storage.
634 -
635 - Retracted.
636 - cf. <CAHd-oW7Wd8oSaMhPFeRcEeKTJ-k_hC7b6e28efhXT5LFu1E_Uw@mail.gmail.com>