What's cooking (2020/09) #03
Junio C Hamano committed
Sep 9, 2020 at 15:22 UTC
384c6afcfa6faac0f11ddd4dbf4e6d8abda1b70a
1 file changed
+331
-288
whats-cooking.txt
+331
-288
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Sep 2020, #02; Thu, 3)
4
-X-master-at: 3a238e539bcdfe3f9eb5010fd218640c1b499f7a
5
-X-next-at: f4bc123cb7519b4205da0f439b0cefc5a5f176ac
3
+Subject: What's cooking in git.git (Sep 2020, #03; Wed, 9)
4
+X-master-at: 54e85e7af1ac9e9a92888060d6811ae767fea1bc
5
+X-next-at: a41e38b8ca5c1f61d7a6b4dd5e741fcd76907bf1
6
7
-What's cooking in git.git (Sep 2020, #02; Thu, 3)
7
+What's cooking in git.git (Sep 2020, #03; Wed, 9)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -20,174 +20,340 @@ repositories listed at
20
--------------------------------------------------
21
[Graduated to 'master']
22
23
-* hl/bisect-doc-clarify-bad-good-ordering (2020-08-28) 1 commit
24
- (merged to 'next' on 2020-08-31 at 11ce613916)
25
- + bisect: swap command-line options in documentation
23
+* es/worktree-repair (2020-08-31) 5 commits
24
+ (merged to 'next' on 2020-08-31 at 604825c5e4)
25
+ + init: make --separate-git-dir work from within linked worktree
26
+ + init: teach --separate-git-dir to repair linked worktrees
27
+ + worktree: teach "repair" to fix outgoing links to worktrees
28
+ + worktree: teach "repair" to fix worktree back-links to main worktree
29
+ + worktree: add skeleton "repair" command
30
27
- Doc update.
31
+ "git worktree" gained a "repair" subcommand to help users recover
32
+ after moving the worktrees or repository manually without telling
33
+ Git. Also, "git init --separate-git-dir" no longer corrupts
34
+ administrative data related to linked worktrees.
35
36
30
-* jc/post-checkout-doc (2020-08-27) 1 commit
31
- (merged to 'next' on 2020-09-02 at bb06b5f978)
32
- + doc: clarify how exit status of post-checkout hook is used
37
+* hv/ref-filter-misc (2020-08-28) 8 commits
38
+ (merged to 'next' on 2020-09-02 at 9a8bb84f20)
39
+ + ref-filter: add `sanitize` option for 'subject' atom
40
+ + pretty: refactor `format_sanitized_subject()`
41
+ + ref-filter: add `short` modifier to 'parent' atom
42
+ + ref-filter: add `short` modifier to 'tree' atom
43
+ + ref-filter: rename `objectname` related functions and fields
44
+ + ref-filter: modify error messages in `grab_objectname()`
45
+ + ref-filter: refactor `grab_objectname()`
46
+ + ref-filter: support different email formats
47
34
- Doc update.
48
+ The "--format=" option to the "for-each-ref" command and friends
49
+ learned a few more tricks, e.g. the ":short" suffix that applies to
50
+ "objectname" now also can be used for "parent", "tree", etc.
51
52
37
-* jc/run-command-use-embedded-args (2020-08-26) 1 commit
38
- (merged to 'next' on 2020-08-27 at c2b688e8e9)
39
- + run_command: teach API users to use embedded 'args' more
53
+* jk/worktree-check-clean-leakfix (2020-08-27) 1 commit
54
+ (merged to 'next' on 2020-08-31 at 220fc43629)
55
+ + worktree: fix leak in check_clean_worktree()
56
41
- Various callers of run_command API has been modernized.
57
+ Leakfix.
58
59
44
-* jc/undash-in-tree-git-callers (2020-08-27) 3 commits
45
- (merged to 'next' on 2020-08-27 at 671fa2f87e)
46
- + credential-cache: use child_process.args
47
- + cvsexportcommit: do not run git programs in dashed form
48
- + transport-helper: do not run git-remote-ext etc. in dashed form
49
- (this branch is used by jc/war-on-dashed-git.)
60
+* js/ci-squelch-false-failure (2020-09-02) 2 commits
61
+ (merged to 'next' on 2020-09-03 at 254f390305)
62
+ + ci: avoid ugly "failure" in the `ci-config` job
63
+ + ci: fix indentation of the `ci-config` job
64
51
- A handful of places in in-tree code still relied on being able to
52
- execute the git subcommands, especially built-ins, in "git-foo"
53
- form, which have been corrected.
65
+ CI noise reduction.
66
67
56
-* jk/slimmed-down (2020-08-13) 5 commits
57
- (merged to 'next' on 2020-08-27 at bc8e9450c6)
58
- + drop vcs-svn experiment
59
- + make git-fast-import a builtin
60
- + make git-bugreport a builtin
61
- + make credential helpers builtins
62
- + Makefile: drop builtins from MSVC pdb list
68
+* jt/interpret-branch-name-fallback (2020-09-02) 3 commits
69
+ (merged to 'next' on 2020-09-03 at 28914ab788)
70
+ + wt-status: tolerate dangling marks
71
+ + refs: move dwim_ref() to header file
72
+ + sha1-name: replace unsigned int with option struct
73
64
- Trim an unused binary and turn a bunch of commands into built-in.
74
+ "git status" has trouble showing where it came from by interpreting
75
+ reflog entries that recordcertain events, e.g. "checkout @{u}", and
76
+ gives a hard/fatal error. Even though it inherently is impossible
77
+ to give a correct answer because the reflog entries lose some
78
+ information (e.g. "@{u}" does not record what branch the user was
79
+ on hence which branch 'the upstream' needs to be computed, and even
80
+ if the record were available, the relationship between branches may
81
+ have changed), at least hide the error to allow "status" show its
82
+ output.
83
84
67
-* jk/xrealloc-avoid-use-after-free (2020-09-02) 1 commit
68
- (merged to 'next' on 2020-09-02 at a1ad92fe1c)
69
- + xrealloc: do not reuse pointer freed by zero-length realloc()
85
+* os/vcbuild (2020-09-08) 3 commits
86
+ (merged to 'next' on 2020-09-08 at 56551401c2)
87
+ + contrib/buildsystems: fix expat library name for generated vcxproj
88
+ (merged to 'next' on 2020-09-03 at 0216ec9cb9)
89
+ + vcbuild: fix batch file name in README
90
+ + vcbuild: fix library name for expat with make MSVC=1
91
71
- It was possible for xrealloc() to send a non-NULL pointer that has
72
- been freed, which has been fixed.
92
+ Fix build procedure for MSVC.
93
94
75
-* jt/fetch-pack-loosen-validation-with-packfile-uri (2020-08-24) 3 commits
76
- (merged to 'next' on 2020-08-27 at efd171f172)
77
- + fetch-pack: make packfile URIs work with transfer.fsckobjects
78
- + fetch-pack: document only_packfile in get_pack()
79
- + (various): document from_promisor parameter
95
+* pb/imap-send-updates (2020-08-31) 3 commits
96
+ (merged to 'next' on 2020-09-02 at 899fca3919)
97
+ + git-imap-send.txt: add note about localized Gmail folders
98
+ + git-imap-send.txt: do verify SSL certificate for gmail.com
99
+ + git-imap-send.txt: don't duplicate 'Examples' sections
100
81
- Bugfix for "git fetch" when the packfile URI capability is in use.
101
+ "git imap-send" updates.
102
103
84
-* jt/lazy-fetch (2020-09-02) 8 commits
85
- (merged to 'next' on 2020-09-02 at 1f8cd016d4)
86
- + fetch: no FETCH_HEAD display if --no-write-fetch-head
87
- (merged to 'next' on 2020-08-27 at 85f2319ba1)
88
- + fetch-pack: remove no_dependents code
89
- + promisor-remote: lazy-fetch objects in subprocess
90
- + fetch-pack: do not lazy-fetch during ref iteration
91
- + fetch: only populate existing_refs if needed
92
- + fetch: avoid reading submodule config until needed
93
- + fetch: allow refspecs specified through stdin
94
- + negotiator/noop: add noop fetch negotiator
104
+* so/separate-field-for-m-and-diff-merges (2020-08-31) 1 commit
105
+ (merged to 'next' on 2020-08-31 at 8def2984ca)
106
+ + revision: add separate field for "-m" of "diff-index -m"
107
96
- Updates to on-demand fetching code in lazily cloned repositories.
108
+ Internal API clean-up to handle two options "diff-index" and "log"
109
+ have, which happen to share the same short form, more sensibly.
110
111
99
-* mr/diff-hide-stat-wo-textual-change (2020-08-19) 1 commit
100
- (merged to 'next' on 2020-08-27 at b9e97254ae)
101
- + diff: teach --stat to ignore uninteresting modifications
112
+* ss/submodule-summary-in-c (2020-08-12) 4 commits
113
+ (merged to 'next' on 2020-08-17 at 9bc352cb70)
114
+ + submodule: port submodule subcommand 'summary' from shell to C
115
+ + t7421: introduce a test script for verifying 'summary' output
116
+ + submodule: rename helper functions to avoid ambiguity
117
+ + submodule: remove extra line feeds between callback struct and macro
118
+ (this branch is used by ss/submodule-summary-in-c-fixes.)
119
103
- "git diff --stat -w" showed 0-line changes for paths whose changes
104
- were only whitespaces, which was not intuitive. We now omit such
105
- paths from the stat output.
120
+ Yet another subcommand of "git submodule" is getting rewritten in C.
121
122
108
-* pb/doc-external-diff-env (2020-09-01) 1 commit
109
- (merged to 'next' on 2020-09-02 at a789fe3fd9)
110
- + git.txt: correct stale 'GIT_EXTERNAL_DIFF' description
123
+* ss/submodule-summary-in-c-fixes (2020-08-27) 3 commits
124
+ (merged to 'next' on 2020-09-02 at 7f959811b8)
125
+ + t7421: eliminate 'grep' check in t7421.4 for mingw compatibility
126
+ + submodule: fix style in function definition
127
+ + submodule: eliminate unused parameters from print_submodule_summary()
128
+ (this branch uses ss/submodule-summary-in-c.)
129
112
- Doc update.
130
+ Fixups to a topic in 'next'.
131
132
115
-* pb/doc-sequence-editor-configuration (2020-08-31) 1 commit
116
- (merged to 'next' on 2020-08-31 at 506466270c)
117
- + doc: mention GIT_SEQUENCE_EDITOR and 'sequence.editor' more
133
+* tb/repack-clearing-midx (2020-08-28) 2 commits
134
+ (merged to 'next' on 2020-08-28 at 4204c0cb5e)
135
+ + midx: traverse the local MIDX first
136
+ (merged to 'next' on 2020-08-27 at a465875cbb)
137
+ + builtin/repack.c: invalidate MIDX only when necessary
138
119
- Doc update.
139
+ When a packfile is removed by "git repack", multi-pack-index gets
140
+ cleared; the code was taught to do so less aggressively by first
141
+ checking if the midx actually refers to a pack that no longer
142
+ exists.
143
144
+--------------------------------------------------
145
+[New Topics]
146
122
-* pw/add-p-allowed-options-fix (2020-08-17) 2 commits
123
- (merged to 'next' on 2020-08-27 at 6cd62753f7)
124
- + add -p: fix checking of user input
125
- + add -p: use ALLOC_GROW_BY instead of ALLOW_GROW
147
+* al/t3200-back-on-a-branch (2020-09-08) 1 commit
148
+ (merged to 'next' on 2020-09-09 at 833e2fc60c)
149
+ + t3200: clean side effect of git checkout --orphan
150
127
- "git add -p" update.
151
+ Test fix.
152
153
+ Will merge to 'master'.
154
130
-* pw/rebase-i-more-options (2020-08-26) 6 commits
131
- (merged to 'next' on 2020-08-27 at c55cfeb247)
132
- + t3436: do not run git-merge-recursive in dashed form
133
- (merged to 'next' on 2020-08-21 at ade71fd49b)
134
- + rebase: add --reset-author-date
135
- + rebase -i: support --ignore-date
136
- + rebase -i: support --committer-date-is-author-date
137
- + am: stop exporting GIT_COMMITTER_DATE
138
- + rebase -i: add --ignore-whitespace flag
155
140
- "git rebase -i" learns a bit more options.
156
+* bc/rev-parse-path-format (2020-09-08) 1 commit
157
+ - rev-parse: add option for absolute or relative path formatting
158
159
+ "git rev-parse" can be explicitly told to give output as absolute
160
+ or relative path.
161
143
-* so/pretty-abbrev-doc (2020-08-27) 1 commit
144
- (merged to 'next' on 2020-08-31 at d664bd0c06)
145
- + pretty-options.txt: fix --no-abbrev-commit description
162
147
- Documentation update for "--no-abbrev-commit".
163
+* ds/maintenance-part-3 (2020-09-06) 6 commits
164
+ - maintenance: recommended schedule in register/start
165
+ - maintenance: add start/stop subcommands
166
+ - maintenance: add [un]register subcommands
167
+ - for-each-repo: run subcommands on configured repos
168
+ - maintenance: add --schedule option and config
169
+ - maintenance: optionally skip --auto process
170
+ (this branch uses ds/maintenance-part-1 and ds/maintenance-part-2.)
171
172
+ Parts of "git maintenance" to ease writing crontab entries (and
173
+ other scheduling system configuration) for it.
174
150
-* ss/t7401-modernize (2020-08-21) 5 commits
151
- (merged to 'next' on 2020-08-27 at 516cba9c64)
152
- + t7401: add a NEEDSWORK
153
- + t7401: change indentation for enhanced readability
154
- + t7401: change syntax of test_i18ncmp calls for clarity
155
- + t7401: use 'short' instead of 'verify' and cut in rev-parse calls
156
- + t7401: modernize style
175
158
- Test clean-up.
176
+* ea/blame-use-oideq (2020-09-08) 1 commit
177
+ (merged to 'next' on 2020-09-09 at babefe4727)
178
+ + blame.c: replace instance of !oidcmp for oideq
179
160
---------------------------------------------------
161
-[New Topics]
180
+ Code cleanup.
181
163
-* js/ci-squelch-false-failure (2020-09-02) 2 commits
164
- (merged to 'next' on 2020-09-03 at 254f390305)
165
- + ci: avoid ugly "failure" in the `ci-config` job
166
- + ci: fix indentation of the `ci-config` job
182
+ Will merge to 'master'.
183
168
- CI noise reduction.
184
+
185
+* es/format-patch-interdiff-cleanup (2020-09-08) 3 commits
186
+ - format-patch: use 'origin' as start of current-series-range when known
187
+ - diff-lib: tighten show_interdiff()'s interface
188
+ - diff: move show_interdiff() from its own file to diff-lib
189
+
190
+ Code cleanup with a slight behaviour change when "format-patch
191
+ --range-diff=<prev> origin..HEAD" gives a single revision to
192
+ <prev>.
193
+
194
+ Will merge to 'next'.
195
+
196
+
197
+* es/wt-add-detach (2020-09-06) 3 commits
198
+ - git-worktree.txt: discuss branch-based vs. throwaway worktrees
199
+ - worktree: teach `add` to recognize -d as shorthand for --detach
200
+ - git-checkout.txt: document -d short option for --detach
201
+
202
+ "git worktree add" learns the "--detach" option to create a new
203
+ worktree without being on a branch.
204
+
205
+ Will merge to 'next'.
206
+
207
+
208
+* hn/refs-ref-log-only-bit (2020-09-08) 1 commit
209
+ (merged to 'next' on 2020-09-09 at f729cb2c81)
210
+ + refs: move REF_LOG_ONLY to refs-internal.h
211
+
212
+ A bit of API reshuffling to make sure stuff common to all backends
213
+ are not defined only in files backend.
214
215
Will merge to 'master'.
216
217
173
-* pb/clang-json-compilation-database (2020-09-02) 1 commit
174
- - Makefile: add support for generating JSON compilation database
218
+* jc/add-i-use-builtin-experimental (2020-09-08) 1 commit
219
+ (merged to 'next' on 2020-09-09 at abcb7515dc)
220
+ + add -i: use the built-in version when feature.experimental is set
221
176
- Developer support.
222
+ The "add -i/-p" machinery has been written in C but it is not used
223
+ by default yet. It is made default to those who are participating
224
+ in feature.experimental experiment.
225
178
- Waiting for a response to a sanity check.
179
- cf. <xmqq1rjkccw8.fsf@gitster.c.googlers.com>
226
+ Will merge to 'master'.
227
228
182
-* os/vcbuild (2020-09-03) 2 commits
183
- (merged to 'next' on 2020-09-03 at 0216ec9cb9)
184
- + vcbuild: fix batch file name in README
185
- + vcbuild: fix library name for expat with make MSVC=1
229
+* jc/quote-path-cleanup (2020-09-08) 6 commits
230
+ - quote: turn 'nodq' parameter into a set of flags
231
+ - quote: rename misnamed sq_lookup[] to cq_lookup[]
232
+ - wt-status: consistently quote paths in "status --short" output
233
+ - quote_path: optionally allow quoting a path with SP in it
234
+ - quote_path: give flags parameter to quote_path()
235
+ - quote_path: rename quote_path_relative() to quote_path()
236
187
- Fix build procedure for MSVC.
237
+ "git status --short" quoted a path with SP in it when tracked, but
238
+ not those that are untracked, ignored or unmerged. They are all
239
+ shown quoted consistently.
240
+
241
+ Undecided.
242
+ This is more involved than alternatives proposed by brian and Réne
243
+ and I am not sure extra changes to the codebase is a net positive.
244
+ cf. <20200908013013.1099937-1-sandals@crustytoothpaste.net>
245
+ cf. <3a72c5f2-35cc-a865-d5f2-02706c48d8ec@web.de>
246
+
247
+
248
+* jk/add-i-fixes (2020-09-08) 2 commits
249
+ (merged to 'next' on 2020-09-09 at 46ea071a7a)
250
+ + add--interactive.perl: specify --no-color explicitly
251
+ + add-patch: fix inverted return code of repo_read_index()
252
+
253
+ "add -i/-p" fixes.
254
+
255
+ Will merge to 'master'.
256
+
257
+
258
+* os/collect-changed-submodules-optim (2020-09-06) 1 commit
259
+ - submodule: suppress checking for file name and ref ambiguity for object ids
260
+
261
+ Optimization around submodule handling.
262
+
263
+ Will merge to 'next'.
264
+
265
+
266
+* os/fetch-submodule-optim (2020-09-06) 1 commit
267
+ - fetch: do not look for submodule changes in unchanged refs
268
+
269
+ Optimization around submodule handling.
270
+
271
+ Will merge to 'next'.
272
+
273
+
274
+* pw/add-p-edit-ita-path (2020-09-09) 1 commit
275
+ - add -p: fix editing of intent-to-add paths
276
+
277
+ "add -p" did not allow editing paths that were only added in
278
+ intent.
279
+
280
+ Will merge to 'next'.
281
+
282
+
283
+* pw/add-p-leakfix (2020-09-08) 1 commit
284
+ (merged to 'next' on 2020-09-09 at 4206d0503c)
285
+ + add -p: fix memory leak
286
+
287
+ Leakfix.
288
+
289
+ Will merge to 'master'.
290
+
291
+
292
+* rs/misc-cleanups (2020-09-06) 3 commits
293
+ (merged to 'next' on 2020-09-09 at 4a19ea9672)
294
+ + pack-bitmap-write: use hashwrite_be32() in write_hash_cache()
295
+ + midx: use hashwrite_u8() in write_midx_header()
296
+ + fast-import: use write_pack_header()
297
+
298
+ Misc cleanups.
299
300
Will merge to 'master'.
301
302
+
303
+* rs/parallel-read-cache-fix (2020-09-06) 1 commit
304
+ (merged to 'next' on 2020-09-09 at 92953a75c4)
305
+ + read-cache: fix mem-pool allocation for multi-threaded index loading
306
+
307
+ A follow-up fix to a topic already in 'master'.
308
+
309
+ Will merge to 'master'.
310
+
311
+
312
+* rs/refspec-leakfix (2020-09-06) 2 commits
313
+ (merged to 'next' on 2020-09-09 at 10741e90a5)
314
+ + refspec: add and use refspec_appendf()
315
+ + push: release strbufs used for refspec formatting
316
+
317
+ Leakfix.
318
+
319
+ Will merge to 'master'.
320
+
321
+
322
+* so/log-tree-diff-cleanup (2020-09-06) 2 commits
323
+ (merged to 'next' on 2020-09-09 at f8744b8e8a)
324
+ + log_tree_diff: get rid of extra check for NULL
325
+ + log_tree_diff: get rid of code duplication for first_parent_only
326
+
327
+ Code cleanup.
328
+
329
+ Will merge to 'master'.
330
+
331
+
332
+* hn/refs-trace-backend (2020-09-09) 1 commit
333
+ - refs: add GIT_TRACE_REFS debugging mechanism
334
+
335
+ Developer support.
336
+
337
+ Will merge to 'next'.
338
+
339
+
340
+* jc/dist-tarball-tweak (2020-09-09) 1 commit
341
+ - Makefile: allow extra tweaking of distribution tarball
342
+
343
+ Allow maintainers to tweak $(TAR) invocations done while making
344
+ distribution tarballs.
345
+
346
+ Will merge to 'next'.
347
+
348
+
349
+* mt/config-fail-nongit-early (2020-09-09) 1 commit
350
+ - config: complain about --worktree outside of a git repo
351
+
352
+ Unlike "git config --local", "git config --worktree" did not fail
353
+ early and cleanly when started outside a git repository.
354
+
355
+ Will merge to 'next'.
356
+
357
--------------------------------------------------
358
[Stalled]
359
@@ -210,14 +376,36 @@ repositories listed at
376
On hold for now.
377
378
213
-* tb/bloom-improvements (2020-08-11) 14 commits
379
+* dr/push-remoteref-fix (2020-04-23) 1 commit
380
+ - remote.c: fix handling of %(push:remoteref)
381
+
382
+ The "%(push:remoteref)" placeholder in the "--format=" argument of
383
+ "git format-patch" (and friends) only showed what got explicitly
384
+ configured, not what ref at the receiving end would be updated when
385
+ "git push" was used, as it ignored the default behaviour (e.g. update
386
+ the same ref as the source).
387
+
388
+ Expecting a reroll.
389
+ cf. <20200416152145.wp2zeibxmuyas6y6@feanor>
390
+ cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
391
+
392
+
393
+* mk/use-size-t-in-zlib (2018-10-15) 1 commit
394
+ - zlib.c: use size_t for size
395
+
396
+ The wrapper to call into zlib followed our long tradition to use
397
+ "unsigned long" for sizes of regions in memory, which have been
398
+ updated to use "size_t".
399
+
400
+--------------------------------------------------
401
+[Cooking]
402
+
403
+* tb/bloom-improvements (2020-09-09) 12 commits
404
- builtin/commit-graph.c: introduce '--max-new-filters=<n>'
405
- commit-graph: rename 'split_commit_graph_opts'
216
- - commit-graph: add large-filters bitmap chunk
217
- - commit-graph.c: sort index into commits list
406
+ - bloom: encode out-of-bounds filters as non-empty
407
- bloom/diff: properly short-circuit on max_changes
408
- bloom: use provided 'struct bloom_filter_settings'
220
- - csum-file.h: introduce 'hashwrite_be64()'
409
- bloom: split 'get_bloom_filter()' in two
410
- commit-graph.c: store maximum changed paths
411
- commit-graph: respect 'commitGraph.readChangedPaths'
@@ -226,16 +414,17 @@ repositories listed at
414
- t4216: use an '&&'-chain
415
- commit-graph: introduce 'get_bloom_filter_settings()'
416
229
- Misc Bloom filter improvements.
230
-
231
- Expecting a reroll.
232
- It seems that the review is getting closer to result in another update.
233
- cf. <20200811220503.GC66656@syl.lan>
417
+ "git commit-graph write" learned to limit the number of bloom
418
+ filters that are computed from scratch with the --max-new-filters
419
+ option.
420
421
236
-* es/config-hooks (2020-07-30) 6 commits
422
+* es/config-hooks (2020-09-09) 9 commits
423
+ - run_commit_hook: take strvec instead of varargs
424
+ - commit: use config-based hooks
425
+ - hook: replace run-command.h:find_hook
426
- hook: add 'run' subcommand
238
- - parse-options: parse into argv_array
427
+ - parse-options: parse into strvec
428
- hook: add --porcelain to list command
429
- hook: add list command
430
- hook: scaffolding for git-hook subcommand
@@ -243,22 +432,15 @@ repositories listed at
432
433
The "hooks defined in config" topic.
434
246
- Expecting a reroll.
247
- Now jk/strvec is in 'master', we may want to see the topic reworked
248
- on top of it. Are there unresolved issues, or does the topic need
249
- a round of detailed review?
250
- cf. <xmqqmu3i9kvg.fsf@gitster.c.googlers.com>
251
-
435
253
-* ls/mergetool-meld-auto-merge (2020-07-12) 2 commits
254
- - SQUASH???
436
+* ls/mergetool-meld-auto-merge (2020-09-09) 1 commit
437
- Support auto-merge for meld to follow the vim-diff behavior
438
439
The 'meld' backend of the "git mergetool" learned to give the
440
underlying 'meld' the '--auto-merge' option, which would help
441
reduce the amount of text that requires manual merging.
442
261
- Expecting a reroll.
443
+ Will merge to 'next'.
444
445
446
* mf/submodule-summary-with-correct-repository (2020-06-24) 2 commits
@@ -269,31 +451,18 @@ repositories listed at
451
the information on commits in the submodule from a wrong repository
452
and gave a wrong information when the commit-graph is involved.
453
272
- Needs tests.
454
+ Will merge to 'next'.
455
+ cf. <xmqqzh667ca4.fsf@gitster.c.googlers.com>
456
457
275
-* dr/push-remoteref-fix (2020-04-23) 1 commit
276
- - remote.c: fix handling of %(push:remoteref)
458
+* pb/clang-json-compilation-database (2020-09-06) 1 commit
459
+ (merged to 'next' on 2020-09-09 at 9f5ea136f1)
460
+ + Makefile: add support for generating JSON compilation database
461
278
- The "%(push:remoteref)" placeholder in the "--format=" argument of
279
- "git format-patch" (and friends) only showed what got explicitly
280
- configured, not what ref at the receiving end would be updated when
281
- "git push" was used, as it ignored the default behaviour (e.g. update
282
- the same ref as the source).
283
-
284
- Expecting a reroll.
285
- cf. <20200416152145.wp2zeibxmuyas6y6@feanor>
286
-
287
-
288
-* mk/use-size-t-in-zlib (2018-10-15) 1 commit
289
- - zlib.c: use size_t for size
462
+ Developer support.
463
291
- The wrapper to call into zlib followed our long tradition to use
292
- "unsigned long" for sizes of regions in memory, which have been
293
- updated to use "size_t".
464
+ Will merge to 'master'.
465
295
---------------------------------------------------
296
-[Cooking]
466
467
* mt/grep-sparse-checkout (2020-09-02) 8 commits
468
- config: add setting to ignore sparsity patterns in some cmds
@@ -309,46 +478,6 @@ repositories listed at
478
paths.
479
480
312
-* jt/interpret-branch-name-fallback (2020-09-02) 3 commits
313
- (merged to 'next' on 2020-09-03 at 28914ab788)
314
- + wt-status: tolerate dangling marks
315
- + refs: move dwim_ref() to header file
316
- + sha1-name: replace unsigned int with option struct
317
-
318
- "git status" has trouble showing where it came from by interpreting
319
- reflog entries that recordcertain events, e.g. "checkout @{u}", and
320
- gives a hard/fatal error. Even though it inherently is impossible
321
- to give a correct answer because the reflog entries lose some
322
- information (e.g. "@{u}" does not record what branch the user was
323
- on hence which branch 'the upstream' needs to be computed, and even
324
- if the record were available, the relationship between branches may
325
- have changed), at least hide the error to allow "status" show its
326
- output.
327
-
328
- Will merge to 'master'.
329
-
330
-
331
-* pb/imap-send-updates (2020-08-31) 3 commits
332
- (merged to 'next' on 2020-09-02 at 899fca3919)
333
- + git-imap-send.txt: add note about localized Gmail folders
334
- + git-imap-send.txt: do verify SSL certificate for gmail.com
335
- + git-imap-send.txt: don't duplicate 'Examples' sections
336
-
337
- "git imap-send" updates.
338
-
339
- Will merge to 'master'.
340
-
341
-
342
-* so/separate-field-for-m-and-diff-merges (2020-08-31) 1 commit
343
- (merged to 'next' on 2020-08-31 at 8def2984ca)
344
- + revision: add separate field for "-m" of "diff-index -m"
345
-
346
- Internal API clean-up to handle two options "diff-index" and "log"
347
- have, which happen to share the same short form, more sensibly.
348
-
349
- Will merge to 'master'.
350
-
351
-
481
* ew/decline-core-abbrev (2020-09-01) 1 commit
482
- core.abbrev <off|false|no> disables abbreviations
483
@@ -379,57 +508,6 @@ repositories listed at
508
cf. <nycvar.QRO.7.76.6.2009031403510.56@tvgsbejvaqbjf.bet>
509
510
382
-* tb/repack-clearing-midx (2020-08-28) 2 commits
383
- (merged to 'next' on 2020-08-28 at 4204c0cb5e)
384
- + midx: traverse the local MIDX first
385
- (merged to 'next' on 2020-08-27 at a465875cbb)
386
- + builtin/repack.c: invalidate MIDX only when necessary
387
-
388
- When a packfile is removed by "git repack", multi-pack-index gets
389
- cleared; the code was taught to do so less aggressively by first
390
- checking if the midx actually refers to a pack that no longer
391
- exists.
392
-
393
- Will merge to 'master'.
394
-
395
-
396
-* es/worktree-repair (2020-08-31) 5 commits
397
- (merged to 'next' on 2020-08-31 at 604825c5e4)
398
- + init: make --separate-git-dir work from within linked worktree
399
- + init: teach --separate-git-dir to repair linked worktrees
400
- + worktree: teach "repair" to fix outgoing links to worktrees
401
- + worktree: teach "repair" to fix worktree back-links to main worktree
402
- + worktree: add skeleton "repair" command
403
-
404
- "git worktree" gained a "repair" subcommand to help users recover
405
- after moving the worktrees or repository manually without telling
406
- Git. Also, "git init --separate-git-dir" no longer corrupts
407
- administrative data related to linked worktrees.
408
-
409
- Will merge to 'master'.
410
-
411
-
412
-* jk/worktree-check-clean-leakfix (2020-08-27) 1 commit
413
- (merged to 'next' on 2020-08-31 at 220fc43629)
414
- + worktree: fix leak in check_clean_worktree()
415
-
416
- Leakfix.
417
-
418
- Will merge to 'master'.
419
-
420
-
421
-* ss/submodule-summary-in-c-fixes (2020-08-27) 3 commits
422
- (merged to 'next' on 2020-09-02 at 7f959811b8)
423
- + t7421: eliminate 'grep' check in t7421.4 for mingw compatibility
424
- + submodule: fix style in function definition
425
- + submodule: eliminate unused parameters from print_submodule_summary()
426
- (this branch uses ss/submodule-summary-in-c.)
427
-
428
- Fixups to a topic in 'next'.
429
-
430
- Will merge to 'master'.
431
-
432
-
511
* js/no-builtins-on-disk-option (2020-08-24) 3 commits
512
- ci: stop linking built-ins to the dashed versions
513
- install: optionally skip linking/copying the built-ins
@@ -452,9 +530,7 @@ repositories listed at
530
cf. <20200903104537.GA27325@szeder.dev>
531
532
455
-* jt/threaded-index-pack (2020-08-27) 9 commits
456
- - builtin/index-pack.c: fix some sparse warnings
457
- - fixup! index-pack: make quantum of work smaller
533
+* jt/threaded-index-pack (2020-09-08) 7 commits
534
- index-pack: make quantum of work smaller
535
- index-pack: make resolve_delta() assume base data
536
- index-pack: calculate {ref,ofs}_{first,last} early
@@ -466,26 +542,7 @@ repositories listed at
542
"git index-pack" learned to resolve deltified objects with greater
543
parallelism.
544
469
- Expecting the final reroll.
470
- cf. https://colabti.org/irclogger/irclogger_log/git-devel?date=2020-08-31#l82
471
-
472
-
473
-* hv/ref-filter-misc (2020-08-28) 8 commits
474
- (merged to 'next' on 2020-09-02 at 9a8bb84f20)
475
- + ref-filter: add `sanitize` option for 'subject' atom
476
- + pretty: refactor `format_sanitized_subject()`
477
- + ref-filter: add `short` modifier to 'parent' atom
478
- + ref-filter: add `short` modifier to 'tree' atom
479
- + ref-filter: rename `objectname` related functions and fields
480
- + ref-filter: modify error messages in `grab_objectname()`
481
- + ref-filter: refactor `grab_objectname()`
482
- + ref-filter: support different email formats
483
-
484
- The "--format=" option to the "for-each-ref" command and friends
485
- learned a few more tricks, e.g. the ":short" suffix that applies to
486
- "objectname" now also can be used for "parent", "tree", etc.
487
-
488
- Will merge to 'master'.
545
+ Will merge to 'next'.
546
547
548
* jk/refspecs-negative (2020-08-21) 1 commit
@@ -509,10 +566,10 @@ repositories listed at
566
"git receive-pack" that accepts requests by "git push" learned to
567
outsource most of the ref updates to the new "proc-receive" hook.
568
512
- Looking good.
569
+ Will merge to 'next'.
570
571
515
-* ds/maintenance-part-2 (2020-08-25) 8 commits
572
+* ds/maintenance-part-2 (2020-09-06) 8 commits
573
- maintenance: add incremental-repack auto condition
574
- maintenance: auto-size incremental-repack batch
575
- maintenance: add incremental-repack task
@@ -521,26 +578,13 @@ repositories listed at
578
- maintenance: create auto condition for loose-objects
579
- maintenance: add loose-objects task
580
- maintenance: add prefetch task
524
- (this branch uses ds/maintenance-part-1.)
581
+ (this branch is used by ds/maintenance-part-3; uses ds/maintenance-part-1.)
582
583
"git maintenance", an extended big brother of "git gc", continues
584
to evolve.
585
586
530
-* ss/submodule-summary-in-c (2020-08-12) 4 commits
531
- (merged to 'next' on 2020-08-17 at 9bc352cb70)
532
- + submodule: port submodule subcommand 'summary' from shell to C
533
- + t7421: introduce a test script for verifying 'summary' output
534
- + submodule: rename helper functions to avoid ambiguity
535
- + submodule: remove extra line feeds between callback struct and macro
536
- (this branch is used by ss/submodule-summary-in-c-fixes.)
537
-
538
- Yet another subcommand of "git submodule" is getting rewritten in C.
539
-
540
- Will merge to 'master'.
541
-
542
-
543
-* ds/maintenance-part-1 (2020-08-25) 11 commits
587
+* ds/maintenance-part-1 (2020-09-06) 11 commits
588
- maintenance: add trace2 regions for task execution
589
- maintenance: add auto condition for commit-graph task
590
- maintenance: use pointers to check --auto
@@ -552,14 +596,13 @@ repositories listed at
596
- maintenance: replace run_auto_gc()
597
- maintenance: add --quiet option
598
- maintenance: create basic maintenance runner
555
- (this branch is used by ds/maintenance-part-2.)
599
+ (this branch is used by ds/maintenance-part-2 and ds/maintenance-part-3.)
600
601
A "git gc"'s big brother has been introduced to take care of more
602
repository maintenance tasks, not limited to the object database
603
cleaning.
604
561
- Almost ready for 'next'.
562
- cf. https://colabti.org/irclogger/irclogger_log/git-devel?date=2020-08-31#l44
605
+ Will merge to 'next'.
606
607
--------------------------------------------------
608
[Discarded]