What's cooking (2021/03 #02)
Junio C Hamano committed
Mar 8, 2021 at 15:20 UTC
7f54dd3f5763426c089851a99819dc66aa7c66bb
1 file changed
+227
-470
whats-cooking.txt
+227
-470
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2021, #01; Tue, 2)
4
-X-master-at: f01623b2c9d14207e497b21ebc6b3ec4afaf4b46
5
-X-next-at: b75b4e4ce211a6bec04cdfcb7eadec68c4e7c388
3
+Subject: What's cooking in git.git (Mar 2021, #02; Mon, 8)
4
+X-master-at: be7935ed8bff19f481b033d0d242c5d5f239ed50
5
+X-next-at: 510d4cfa5f76b646b8e82232cbaed56bd0170dae
6
7
-What's cooking in git.git (Mar 2021, #01; Tue, 2)
7
+What's cooking in git.git (Mar 2021, #02; Mon, 8)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,7 +12,7 @@ only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
12
with '+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-A release candidate Git v2.31.0-rc1 has been tagged.
15
+The second release candidate Git v2.31.0-rc2 will be tagged tomorrow.
16
17
Copies of the source code to Git live in many repositories, and the
18
following is a list of the ones I push into or their mirrors. Some
@@ -45,512 +45,173 @@ Release tarballs are available at:
45
--------------------------------------------------
46
[Graduated to 'master']
47
48
-* ab/detox-gettext-tests (2021-02-10) 4 commits
49
- (merged to 'next' on 2021-02-17 at bd3d771557)
50
- + tests: remove most uses of test_i18ncmp
51
- + tests: remove last uses of C_LOCALE_OUTPUT
52
- + tests: remove most uses of C_LOCALE_OUTPUT
53
- + tests: remove last uses of GIT_TEST_GETTEXT_POISON=false
54
-
55
- Removal of GIT_TEST_GETTEXT_POISON continues.
56
-
57
-
58
-* ab/diff-deferred-free (2021-02-11) 2 commits
59
- (merged to 'next' on 2021-02-12 at 5e24106122)
60
- + diff: plug memory leak from regcomp() on {log,diff} -I
61
- + diff: add an API for deferred freeing
62
-
63
- A small memleak in "diff -I<regexp>" has been corrected.
64
-
65
-
66
-* ab/pager-exit-log (2021-02-01) 4 commits
67
- (merged to 'next' on 2021-02-12 at ffe9f2d364)
68
- + pager: properly log pager exit code when signalled
69
- + run-command: add braces for "if" block in wait_or_whine()
70
- + pager: test for exit code with and without SIGPIPE
71
- + pager: refactor wait_for_pager() function
72
-
73
- When a pager spawned by us exited, the trace log did not record its
74
- exit status correctly, which has been corrected.
75
- The original "what should we do with SIGPIPE?" question remains, though.
76
-
77
-
78
-* ab/test-lib (2021-02-12) 11 commits
79
- (merged to 'next' on 2021-02-12 at 666a0422dc)
80
- + test-lib-functions: assert correct parameter count
81
- + test-lib-functions: remove bug-inducing "diagnostics" helper param
82
- + test libs: rename "diff-lib" to "lib-diff"
83
- + t/.gitattributes: sort lines
84
- + test-lib-functions: move function to lib-bitmap.sh
85
- + test libs: rename gitweb-lib.sh to lib-gitweb.sh
86
- + test libs: rename bundle helper to "lib-bundle.sh"
87
- + test-lib-functions: remove generate_zero_bytes() wrapper
88
- + test-lib-functions: move test_set_index_version() to its user
89
- + test lib: change "error" to "BUG" as appropriate
90
- + test-lib: remove check_var_migration
91
- (this branch is used by ab/pickaxe-pcre2.)
92
-
93
- Test framework clean-up.
94
-
95
-
96
-* ah/commit-graph-leakplug (2021-02-22) 1 commit
97
- (merged to 'next' on 2021-02-22 at 1330b452db)
98
- + commit-graph: avoid leaking topo_levels slab in write_commit_graph()
99
-
100
- Plug a minor memory leak.
101
-
102
-
103
-* ah/rebase-no-fork-point-config (2021-02-24) 1 commit
104
- (merged to 'next' on 2021-02-24 at 8e56891909)
105
- + rebase: add a config option for --no-fork-point
106
-
107
- "git rebase --[no-]fork-point" gained a configuration variable
108
- rebase.forkPoint so that users do not have to keep specifying a
109
- non-default setting.
110
-
111
-
112
-* bc/signed-objects-with-both-hashes (2021-02-10) 6 commits
113
- (merged to 'next' on 2021-02-11 at 391cc85104)
114
- + gpg-interface: remove other signature headers before verifying
115
- + ref-filter: hoist signature parsing
116
- + commit: allow parsing arbitrary buffers with headers
117
- + gpg-interface: improve interface for parsing tags
118
- + commit: ignore additional signatures when parsing signed commits
119
- + ref-filter: switch some uses of unsigned long to size_t
120
-
121
- Signed commits and tags now allow verification of objects, whose
122
- two object names (one in SHA-1, the other in SHA-256) are both
123
- signed.
124
-
125
-
126
-* cw/pack-config-doc (2021-02-22) 1 commit
127
- (merged to 'next' on 2021-02-22 at cfd2f5ccd1)
128
- + doc: mention bigFileThreshold for packing
129
-
130
- Doc update.
131
-
132
-
133
-* dl/doc-config-camelcase (2021-02-24) 3 commits
134
- (merged to 'next' on 2021-02-24 at 5315e84c47)
135
- + index-format doc: camelCase core.excludesFile
136
- + blame-options.txt: camelcase blame.blankBoundary
137
- + i18n.txt: camel case and monospace "i18n.commitEncoding"
138
-
139
- A handful of multi-word configuration variable names in
140
- documentation that are spelled in all lowercase have been corrected
141
- to use the more canonical camelCase.
142
-
143
-
144
-* dl/stash-cleanup (2021-02-11) 7 commits
145
- (merged to 'next' on 2021-02-11 at ae1cde1380)
146
- + stash: declare ref_stash as an array
147
- + t3905: use test_cmp() to check file contents
148
- + t3905: replace test -s with test_file_not_empty
149
- + t3905: remove nested git in command substitution
150
- + t3905: move all commands into test cases
151
- + t3905: remove spaces after redirect operators
152
- + git-stash.txt: be explicit about subcommand options
153
- (this branch is used by dl/stash-show-untracked.)
154
-
155
- Documentation, code and test clean-up around "git stash".
156
- This is an early part of a topic that added a new feature to the
157
- command, but the implementation is expected to need a handful of
158
- iterations; I split the preparatory part up to fast-track it.
159
-
160
-
161
-* ds/chunked-file-api (2021-02-24) 18 commits
162
- (merged to 'next' on 2021-02-24 at 6002da063c)
163
- + commit-graph.c: display correct number of chunks when writing
164
- (merged to 'next' on 2021-02-22 at 5f0e28cfb2)
165
- + chunk-format: add technical docs
166
- + chunk-format: restore duplicate chunk checks
167
- + midx: use 64-bit multiplication for chunk sizes
168
- + midx: use chunk-format read API
169
- + commit-graph: use chunk-format read API
170
- + chunk-format: create read chunk API
171
- + midx: use chunk-format API in write_midx_internal()
172
- + midx: drop chunk progress during write
173
- + midx: return success/failure in chunk write methods
174
- + midx: add num_large_offsets to write_midx_context
175
- + midx: add pack_perm to write_midx_context
176
- + midx: add entries to write_midx_context
177
- + midx: use context in write_midx_pack_names()
178
- + midx: rename pack_info to write_midx_context
179
- + commit-graph: use chunk-format write API
180
- + chunk-format: create chunk format write API
181
- + commit-graph: anonymize data in chunk_write_fn
182
- (this branch is used by ds/commit-graph-generation-config and tb/reverse-midx.)
183
-
184
- The common code to deal with "chunked file format" that is shared
185
- by the multi-pack-index and commit-graph files have been factored
186
- out, to help codepaths for both filetypes to become more robust.
187
-
188
-
189
-* ds/merge-base-independent (2021-02-22) 5 commits
190
- (merged to 'next' on 2021-02-24 at 9fad5352ea)
191
- + commit-reach: stale commits may prune generation further
192
- + commit-reach: use heuristic in remove_redundant()
193
- + commit-reach: move compare_commits_by_gen
194
- + commit-reach: use one walk in remove_redundant()
195
- + commit-reach: reduce requirements for remove_redundant()
196
-
197
- The code to implement "git merge-base --independent" was poorly
198
- done and was kept from the very beginning of the feature.
199
-
200
-
201
-* en/diffcore-rename (2021-02-15) 8 commits
202
- (merged to 'next' on 2021-02-22 at 243d0182da)
203
- + merge-ort: call diffcore_rename() directly
204
- + gitdiffcore doc: mention new preliminary step for rename detection
205
- + diffcore-rename: guide inexact rename detection based on basenames
206
- + diffcore-rename: complete find_basename_matches()
207
- + diffcore-rename: compute basenames of source and dest candidates
208
- + t4001: add a test comparing basename similarity and content similarity
209
- + diffcore-rename: filter rename_src list when possible
210
- + diffcore-rename: no point trying to find a match better than exact
211
-
212
- Performance optimization work on the rename detection continues.
213
-
214
-
215
-* es/maintenance-of-bare-repositories (2021-02-23) 1 commit
216
- (merged to 'next' on 2021-02-24 at 73a40e23b3)
217
- + maintenance: fix incorrect `maintenance.repo` path with bare repository
218
-
219
- The "git maintenance register" command had trouble registering bare
220
- repositories, which had been corrected.
221
-
222
-
223
-* hn/reftable-tables-doc-update (2021-02-23) 1 commit
224
- (merged to 'next' on 2021-02-25 at cfeadb4945)
225
- + doc/reftable: document how to handle windows
226
-
227
- Documentation update.
228
-
229
-
230
-* hv/trailer-formatting (2021-02-15) 4 commits
231
- (merged to 'next' on 2021-02-25 at 7d1d5ecf59)
232
- + ref-filter: use pretty.c logic for trailers
233
- + pretty.c: capture invalid trailer argument
234
- + pretty.c: refactor trailer logic to `format_set_trailers_options()`
235
- + t6300: use function to test trailer options
236
-
237
- The logic to handle "trailer" related placeholders in the
238
- "--format=" mechanisms in the "log" family and "for-each-ref"
239
- family is getting unified.
240
-
241
-
242
-* jc/diffcore-rotate (2021-02-16) 1 commit
243
- (merged to 'next' on 2021-02-22 at f17c341d20)
244
- + diff: --{rotate,skip}-to=<path>
245
- (this branch is used by zh/difftool-skip-to.)
246
-
247
- "git {diff,log} --{skip,rotate}-to=<path>" allows the user to
248
- discard diff output for early paths or move them to the end of the
249
- output.
250
-
251
-
252
-* jc/maint-column-doc-typofix (2021-02-19) 1 commit
253
- (merged to 'next' on 2021-02-22 at d927f64824)
254
- + Documentation: typofix --column description
48
+* jk/open-returns-eintr (2021-03-01) 2 commits
49
+ (merged to 'next' on 2021-03-02 at 7f0218e627)
50
+ + config.mak.uname: enable OPEN_RETURNS_EINTR for macOS Big Sur
51
+ + Makefile: add OPEN_RETURNS_EINTR knob
52
256
- Doc update.
53
+ Work around platforms whose open() is reported to return EINTR (it
54
+ shouldn't, as we do our signals with SA_RESTART).
55
56
+--------------------------------------------------
57
+[New Topics]
58
259
-* jc/push-delete-nothing (2021-02-23) 1 commit
260
- (merged to 'next' on 2021-02-24 at 9d5481ea10)
261
- + push: do not turn --delete '' into a matching push
59
+* ab/make-cocci-dedup (2021-03-05) 4 commits
60
+ - Makefile/coccicheck: set SPATCH_BATCH_SIZE to 8
61
+ - Makefile/coccicheck: allow for setting xargs concurrency
62
+ - Makefile/coccicheck: speed up and fix bug with duplicate hunks
63
+ - Makefile/coccicheck: add comment heading for all SPATCH flags
64
263
- "git push $there --delete ''" should have been diagnosed as an
264
- error, but instead turned into a matching push, which has been
265
- corrected.
65
+ An attempt to speed up the coccicheck target with incorrect
66
+ results.
67
68
+ A reroll exists to address correctness issue, but not picked up.
69
268
-* jh/fsmonitor-prework (2021-02-16) 11 commits
269
- (merged to 'next' on 2021-02-17 at 1943efb5ac)
270
- + fsmonitor: refactor initialization of fsmonitor_last_update token
271
- + fsmonitor: allow all entries for a folder to be invalidated
272
- + fsmonitor: log FSMN token when reading and writing the index
273
- + fsmonitor: log invocation of FSMonitor hook to trace2
274
- + read-cache: log the number of scanned files to trace2
275
- + read-cache: log the number of lstat calls to trace2
276
- + preload-index: log the number of lstat calls to trace2
277
- + p7519: add trace logging during perf test
278
- + p7519: move watchman cleanup earlier in the test
279
- + p7519: fix watchman watch-list test on Windows
280
- + p7519: do not rely on "xargs -d" in test
70
282
- Preliminary changes to fsmonitor integration.
71
+* ab/read-tree (2021-03-08) 6 commits
72
+ - tree.h API: remove "stage" parameter from read_tree_recursive()
73
+ - tree.h API: remove support for starting at prefix != ""
74
+ - ls-files: refactor away read_tree()
75
+ - ls-files: don't needlessly pass around stage variable
76
+ - tree.c API: move read_tree() into builtin/ls-files.c
77
+ - ls-files tests: add meaningful --with-tree tests
78
79
+ Code simplification by removing support for a caller that is long gone.
80
+
81
+ Looked good.
82
285
-* jh/untracked-cache-fix (2021-02-24) 1 commit
286
- (merged to 'next' on 2021-02-25 at 79d1e40211)
287
- + dir: fix malloc of root untracked_cache_dir
83
289
- An under-allocation for the untracked cache data has been corrected.
84
+* ab/unexpected-object-type (2021-03-08) 7 commits
85
+ - tag: don't misreport type of tagged objects in errors
86
+ - object tests: add test for unexpected objects in tags
87
+ - object.c: add a utility function for "expected type X, got Y"
88
+ - tree.c: fix misindentation in parse_tree_gently()
89
+ - oid_object_info(): return "enum object_type"
90
+ - object.c: make type_from_string() return "enum object_type"
91
+ - object.c: refactor type_from_string_gently()
92
93
+ Error reporting upon object type mismatch has been improved
94
292
-* jk/rev-list-disk-usage (2021-02-17) 4 commits
293
- (merged to 'next' on 2021-02-22 at 37a29a3495)
294
- + docs/rev-list: add some examples of --disk-usage
295
- + docs/rev-list: add an examples section
296
- (merged to 'next' on 2021-02-11 at 6fb701f287)
297
- + rev-list: add --disk-usage option for calculating disk usage
298
- + t: add --no-tag option to test_commit
299
- (this branch is used by ab/pickaxe-pcre2.)
95
+ Looked good.
96
301
- "git rev-list" command learned "--disk-usage" option.
97
98
+* ah/make-fuzz-all-doc-update (2021-03-04) 1 commit
99
+ - Makefile: update 'make fuzz-all' docs to reflect modern clang
100
304
-* js/doc-proto-v2-response-end (2021-02-17) 1 commit
305
- (merged to 'next' on 2021-02-17 at 9d5d479469)
306
- + doc: fix naming of response-end-pkt
101
+ Update insn in Makefile comments to run fuzz-all target.
102
308
- Docfix.
103
+ Needs review.
104
+ cf. <pull.889.v3.git.1615223682911.gitgitgadget@gmail.com>
105
+ cf. <defff7a3-2104-4fa1-7750-0b13ca5cdf59@ahunt.org>
106
107
311
-* js/params-vs-args (2021-02-23) 1 commit
312
- (merged to 'next' on 2021-02-24 at 0a1ff0bc16)
313
- + replace "parameters" by "arguments" in error messages
108
+* ah/plugleaks (2021-03-08) 7 commits
109
+ - parse-options: don't leak alias help messages
110
+ - init-db: silence template_dir leak when converting to absolute path
111
+ - init: remove git_init_db_config() while fixing leaks
112
+ - worktree: fix leak in dwim_branch()
113
+ - clone: free or UNLEAK further pointers when finished
114
+ - reset: free instead of leaking unneeded ref
115
+ - symbolic-ref: don't leak shortened refname in check_symref()
116
315
- Messages update.
117
+ Plug or annotate remaining leaks that trigger while running the
118
+ very basic set of tests.
119
120
318
-* jt/transfer-fsck-across-packs (2021-02-22) 4 commits
319
- (merged to 'next' on 2021-02-22 at 76f1327431)
320
- + fetch-pack: print and use dangling .gitmodules
321
- + fetch-pack: with packfile URIs, use index-pack arg
322
- + http-fetch: allow custom index-pack args
323
- + http: allow custom index-pack args
121
+* bc/clone-bare-with-conflicting-config (2021-03-08) 1 commit
122
+ - builtin/init-db: handle bare clones when core.bare set to false
123
325
- The approach to "fsck" the incoming objects in "index-pack" is
326
- attractive for performance reasons (we have them already in core,
327
- inflated and ready to be inspected), but fundamentally cannot be
328
- applied fully when we receive more than one pack stream, as a tree
329
- object in one pack may refer to a blob object in another pack as
330
- ".gitmodules", when we want to inspect blobs that are used as
331
- ".gitmodules" file, for example. Teach "index-pack" to emit
332
- objects that must be inspected later and check them in the calling
333
- "fetch-pack" process.
124
+ "git -c core.bare=false clone --bare ..." would have segfaulted,
125
+ which has been corrected.
126
127
+ Will merge to 'next'.
128
336
-* ma/doc-markup-fix (2021-02-18) 3 commits
337
- (merged to 'next' on 2021-02-22 at a8e9e712c8)
338
- + gitmailmap.txt: fix rendering of e-mail addresses
339
- + git.txt: fix monospace rendering
340
- + rev-list-options.txt: fix rendering of bonus paragraph
129
342
- Docfix.
130
+* dl/cat-file-doc-cleanup (2021-03-03) 2 commits
131
+ - git-cat-file.txt: remove references to "sha1"
132
+ - git-cat-file.txt: monospace args, placeholders and filenames
133
134
+ Doc cleanup.
135
345
-* mt/add-chmod-fixes (2021-02-24) 3 commits
346
- (merged to 'next' on 2021-02-24 at 6c0977f3be)
347
- + add: propagate --chmod errors to exit status
348
- + add: mark --chmod error string for translation
349
- + add --chmod: don't update index when --dry-run is used
136
+ Will merge to 'next'.
137
351
- Various fixes on "git add --chmod".
138
139
+* jh/simple-ipc-cleanups (2021-03-04) 9 commits
140
+ - SQUASH???
141
+ - simple-ipc: update design documentation with more details
142
+ - test-simple-ipc: add --token=<token> string option
143
+ - test-simple-ipc: refactor command line option processing in helper
144
+ - unix-stream-server: add st_dev and st_mode to socket stolen checks
145
+ - simple-ipc: move error handling up a level
146
+ - unix-stream-server: create unix-stream-server.c
147
+ - unix-socket: simplify initialization of unix_stream_listen_opts
148
+ - pkt-line: remove buffer arg from write_packetized_from_fd_no_flush()
149
+ (this branch uses jh/simple-ipc.)
150
354
-* mt/checkout-index-corner-cases (2021-02-16) 2 commits
355
- (merged to 'next' on 2021-02-17 at 81dad9735b)
356
- + checkout-index: omit entries with no tempname from --temp output
357
- + write_entry(): fix misuses of `path` in error messages
151
359
- The error codepath around the "--temp/--prefix" feature of "git
360
- checkout-index" has been improved.
152
+* jr/doc-ignore-typofix (2021-03-03) 1 commit
153
+ - doc: .gitignore documentation typofix
154
155
+ Doc cleanup.
156
363
-* mt/grep-sparse-checkout (2021-02-09) 1 commit
364
- (merged to 'next' on 2021-02-24 at 246fc2ad56)
365
- + grep: honor sparse-checkout on working tree searches
157
+ Will merge to 'next'.
158
367
- "git grep" has been tweaked to be limited to the sparse checkout
368
- paths.
159
160
+* jt/transfer-fsck-across-packs-fix (2021-03-05) 1 commit
161
+ (merged to 'next' on 2021-03-07 at c79f295216)
162
+ + fetch-pack: do not mix --pack_header and packfile uri
163
371
-* mz/doc-notes-are-not-anchors (2021-02-10) 1 commit
372
- (merged to 'next' on 2021-02-17 at 81f92a74b2)
373
- + docs: clarify that refs/notes/ do not keep the attached objects alive
164
+ The code to fsck objects received across multiple packs during a
165
+ single git fetch session has been broken when the packfile URI
166
+ feature was in use. A workaround has been added by disabling the
167
+ codepath to avoid keeping a packfile that is too small.
168
375
- Objects that lost references can be pruned away, even when they
376
- have notes attached to it (and these notes will become dangling,
377
- which in turn can be pruned with "git notes prune"). This has been
378
- clarified in the documentation.
169
+ Will merge to 'master'.
170
171
381
-* ns/raise-write-index-buffer-size (2021-02-24) 1 commit
382
- (merged to 'next' on 2021-02-25 at 8f43f67ba7)
383
- + read-cache: make the index write buffer size 128K
172
+* rr/mailmap-entry-self (2021-03-08) 1 commit
173
+ - Add entry for Ramkumar Ramachandra
174
385
- Raise the buffer size used when writing the index file out from
386
- (obviously too small) 8kB to (clearly sufficiently large) 128kB.
387
- We may want to extend this to use a value the platform suggests as
388
- the best size with a follow-up patch, but this should do for now.
175
+ Will merge to 'next'.
176
177
391
-* rs/blame-optim (2021-02-17) 1 commit
392
- (merged to 'next' on 2021-02-17 at e54665eeb3)
393
- + blame: remove unnecessary use of get_commit_info()
178
+* rs/xcalloc-takes-nelem-first (2021-03-08) 1 commit
179
+ - fix xcalloc() argument order
180
395
- Optimization in "git blame"
181
+ Code cleanup.
182
183
+ Will merge to 'next'.
184
398
-* sh/mergetools-vimdiff1 (2021-02-23) 1 commit
399
- (merged to 'next' on 2021-02-24 at dbd4c6684c)
400
- + mergetools/vimdiff: add vimdiff1 merge tool variant
185
402
- Mergetools update.
186
+* sv/t9801-test-path-is-file-cleanup (2021-03-03) 1 commit
187
+ - t9801: replace test -f with test_path_is_file
188
189
+ Test cleanup.
190
405
-* sv/t7001-modernize (2021-02-11) 10 commits
406
- (merged to 'next' on 2021-02-25 at 368861a00d)
407
- + t7001: use `test` rather than `[`
408
- + t7001: use here-docs instead of echo
409
- + t7001: put each command on a separate line
410
- + t7001: use '>' rather than 'touch'
411
- + t7001: avoid using `cd` outside of subshells
412
- + t7001: remove whitespace after redirect operators
413
- + t7001: modernize subshell formatting
414
- + t7001: remove unnecessary blank lines
415
- + t7001: indent with TABs instead of spaces
416
- + t7001: modernize test formatting
191
+ Will merge to 'next'.
192
418
- Test script modernization.
193
194
+* tb/git-mv-icase-fix (2021-03-03) 1 commit
195
+ - git mv foo FOO ; git mv foo bar gave an assert
196
421
-* ta/hash-function-transition-doc (2021-02-05) 6 commits
422
- (merged to 'next' on 2021-02-12 at f620f3cfd3)
423
- + doc: use https links
424
- + doc hash-function-transition: move rationale upwards
425
- + doc hash-function-transition: fix incomplete sentence
426
- + doc hash-function-transition: use upper case consistently
427
- + doc hash-function-transition: use SHA-1 and SHA-256 consistently
428
- + doc hash-function-transition: fix asciidoc output
197
+ Fix a corner case bug in "git mv" on case insensitive systems,
198
+ which was introduced in 2.29 timeframe.
199
430
- Update formatting and grammar of the hash transition plan
431
- documentation, plus some updates.
200
+ Will merge to 'next'.
201
202
434
-* ug/doc-commit-approxidate (2021-02-23) 1 commit
435
- (merged to 'next' on 2021-02-24 at 825686380e)
436
- + doc: mention approxidates for git-commit --date
203
+* tb/push-simple-uses-branch-merge-config (2021-03-08) 1 commit
204
+ - Documentation/git-push.txt: correct configuration typo
205
206
Doc update.
207
440
-
441
-* zh/difftool-skip-to (2021-02-22) 1 commit
442
- (merged to 'next' on 2021-02-22 at eeff734f2b)
443
- + difftool.c: learn a new way start at specified file
444
- (this branch uses jc/diffcore-rotate.)
445
-
446
- "git difftool" learned "--skip-to=<path>" option to restart an
447
- interrupted session from an arbitrary path.
448
-
449
---------------------------------------------------
450
-[New Topics]
451
-
452
-* ab/remote-write-config-in-camel-case (2021-02-24) 2 commits
453
- (merged to 'next' on 2021-03-01 at a01bd0d8e4)
454
- + remote: write camel-cased *.pushRemote on rename
455
- + remote: add camel-cased *.tagOpt key, like clone
456
-
457
- Update C code that sets a few configuration variables when a remote
458
- is configured so that it spells configuration variable names in the
459
- canonical camelCase.
460
-
461
- Will cook in 'next'.
462
-
463
-
464
-* ds/commit-graph-generation-config (2021-02-25) 2 commits
465
- (merged to 'next' on 2021-03-01 at 926537ea97)
466
- + commit-graph: use config to specify generation type
467
- + commit-graph: create local repository pointer
468
-
469
- A new configuration variable has been introduced to allow choosing
470
- which version of the generation number gets used in the
471
- commit-graph file.
472
-
473
- Will cook in 'next'.
474
-
475
-
476
-* mt/cleanly-die-upon-missing-required-filter (2021-02-26) 1 commit
477
- (merged to 'next' on 2021-03-01 at 357954af7c)
478
- + convert: fail gracefully upon missing clean cmd on required filter
479
-
480
- We had a code to diagnose and die cleanly when a required
481
- clean/smudge filter is missing, but an assert before that
482
- unnecessarily fired, hiding the end-user facing die() message.
483
-
484
- Will cook in 'next'.
485
-
486
-
487
-* ab/describe-tests-fix (2021-03-01) 10 commits
488
- - test-lib: return 1 from test_expect_{success,failure}
489
- - svn tests: refactor away a "set -e" in test body
490
- - svn tests: remove legacy re-setup from init-clone test
491
- - describe tests: support -C in "check_describe"
492
- - describe tests: fix nested "test_expect_success" call
493
- - describe tests: convert setup to use test_commit
494
- - test-lib functions: add an --annotated-tag option to "test_commit"
495
- - describe tests: always assert empty stderr from "describe"
496
- - describe tests: refactor away from glob matching
497
- - describe tests: improve test for --work-tree & --dirty
498
-
499
- Various updates to tests around "git describe"
500
-
501
-
502
-* en/ort-perf-batch-8 (2021-02-26) 10 commits
503
- - diffcore-rename: compute dir_rename_guess from dir_rename_counts
504
- - diffcore-rename: limit dir_rename_counts computation to relevant dirs
505
- - diffcore-rename: compute dir_rename_counts in stages
506
- - diffcore-rename: extend cleanup_dir_rename_info()
507
- - diffcore-rename: move dir_rename_counts into dir_rename_info struct
508
- - diffcore-rename: add function for clearing dir_rename_count
509
- - Move computation of dir_rename_count from merge-ort to diffcore-rename
510
- - diffcore-rename: add a mapping of destination names to their indices
511
- - diffcore-rename: provide basic implementation of idx_possible_rename()
512
- - diffcore-rename: use directory rename guided basename comparisons
513
-
514
- Rename detection rework continues.
515
-
516
-
517
-* jk/open-returns-eintr (2021-03-01) 2 commits
518
- (merged to 'next' on 2021-03-02 at 7f0218e627)
519
- + config.mak.uname: enable OPEN_RETURNS_EINTR for macOS Big Sur
520
- + Makefile: add OPEN_RETURNS_EINTR knob
521
-
522
- Work around platforms whose open() is reported to return EINTR (it
523
- shouldn't, as we do our signals with SA_RESTART).
524
-
525
- Will cook in 'next'.
526
-
527
-
528
-* jk/perf-in-worktrees (2021-02-26) 2 commits
529
- (merged to 'next' on 2021-03-02 at ea298cb298)
530
- + t/perf: avoid copying worktree files from test repo
531
- + t/perf: handle worktrees as test repos
532
-
533
- Perf test update to work better in secondary worktrees.
534
-
535
- Will cook in 'next'.
536
-
537
-
538
-* ps/update-ref-trans-hook-doc (2021-03-01) 2 commits
539
- - githooks.txt: clarify documentation on reference-transaction hook
540
- - githooks.txt: replace mentions of SHA-1 specific properties
541
-
542
-
543
-* tb/pack-revindex-on-disk (2021-02-26) 1 commit
544
- - pack-revindex.c: don't close unopened file descriptors
545
-
546
-
547
-* zh/format-patch-fractional-reroll-count (2021-03-01) 1 commit
548
- - format-patch: allow a non-integral version numbers
208
+ cf. <YEaM7ruZCvaQQbPI@nand.local>
209
210
--------------------------------------------------
211
[Stalled]
212
553
-* hn/reftable (2020-12-21) 16 commits
213
+* hn/reftable (2021-03-08) 17 commits
214
+ - SQUASH??? calloc(nmemb,size)
215
- SQUASH??? allow t0031 to run with any default branch name
216
- Add "test-tool dump-reftable" command.
217
- git-prompt: prepare for reftable refs backend
@@ -613,17 +274,15 @@ Release tarballs are available at:
274
cf. <YC7o2rUQOEdiMdqh@google.com>
275
276
616
-* dl/stash-show-untracked (2021-02-16) 4 commits
617
- - SQUASH???
618
- - SQUASH???
619
- - stash show: learn stash.showIncludeUntracked
620
- - stash show: teach --include-untracked and --only-untracked
277
+* dl/stash-show-untracked (2021-03-05) 2 commits
278
+ (merged to 'next' on 2021-03-08 at 510d4cfa5f)
279
+ + stash show: learn stash.showIncludeUntracked
280
+ + stash show: teach --include-untracked and --only-untracked
281
282
"git stash show" learned to optionally show untracked part of the
283
stash.
284
625
- Expecting a reroll.
626
- cf. <cover.1613459474.git.liu.denton@gmail.com>
285
+ Will cook in 'next'.
286
287
288
* ab/fsck-api-cleanup (2021-02-18) 10 commits
@@ -689,6 +348,97 @@ Release tarballs are available at:
348
--------------------------------------------------
349
[Cooking]
350
351
+* ab/remote-write-config-in-camel-case (2021-02-24) 2 commits
352
+ (merged to 'next' on 2021-03-01 at a01bd0d8e4)
353
+ + remote: write camel-cased *.pushRemote on rename
354
+ + remote: add camel-cased *.tagOpt key, like clone
355
+
356
+ Update C code that sets a few configuration variables when a remote
357
+ is configured so that it spells configuration variable names in the
358
+ canonical camelCase.
359
+
360
+ Will cook in 'next'.
361
+
362
+
363
+* ds/commit-graph-generation-config (2021-02-25) 2 commits
364
+ (merged to 'next' on 2021-03-01 at 926537ea97)
365
+ + commit-graph: use config to specify generation type
366
+ + commit-graph: create local repository pointer
367
+
368
+ A new configuration variable has been introduced to allow choosing
369
+ which version of the generation number gets used in the
370
+ commit-graph file.
371
+
372
+ Will cook in 'next'.
373
+
374
+
375
+* mt/cleanly-die-upon-missing-required-filter (2021-02-26) 1 commit
376
+ (merged to 'next' on 2021-03-01 at 357954af7c)
377
+ + convert: fail gracefully upon missing clean cmd on required filter
378
+
379
+ We had a code to diagnose and die cleanly when a required
380
+ clean/smudge filter is missing, but an assert before that
381
+ unnecessarily fired, hiding the end-user facing die() message.
382
+
383
+ Will cook in 'next'.
384
+
385
+
386
+* ab/describe-tests-fix (2021-03-01) 10 commits
387
+ - test-lib: return 1 from test_expect_{success,failure}
388
+ - svn tests: refactor away a "set -e" in test body
389
+ - svn tests: remove legacy re-setup from init-clone test
390
+ - describe tests: support -C in "check_describe"
391
+ - describe tests: fix nested "test_expect_success" call
392
+ - describe tests: convert setup to use test_commit
393
+ - test-lib functions: add an --annotated-tag option to "test_commit"
394
+ - describe tests: always assert empty stderr from "describe"
395
+ - describe tests: refactor away from glob matching
396
+ - describe tests: improve test for --work-tree & --dirty
397
+
398
+ Various updates to tests around "git describe"
399
+
400
+
401
+* en/ort-perf-batch-8 (2021-02-26) 10 commits
402
+ (merged to 'next' on 2021-03-07 at f03b2c1acd)
403
+ + diffcore-rename: compute dir_rename_guess from dir_rename_counts
404
+ + diffcore-rename: limit dir_rename_counts computation to relevant dirs
405
+ + diffcore-rename: compute dir_rename_counts in stages
406
+ + diffcore-rename: extend cleanup_dir_rename_info()
407
+ + diffcore-rename: move dir_rename_counts into dir_rename_info struct
408
+ + diffcore-rename: add function for clearing dir_rename_count
409
+ + Move computation of dir_rename_count from merge-ort to diffcore-rename
410
+ + diffcore-rename: add a mapping of destination names to their indices
411
+ + diffcore-rename: provide basic implementation of idx_possible_rename()
412
+ + diffcore-rename: use directory rename guided basename comparisons
413
+
414
+ Rename detection rework continues.
415
+
416
+ Will cook in 'next'.
417
+
418
+
419
+* jk/perf-in-worktrees (2021-02-26) 2 commits
420
+ (merged to 'next' on 2021-03-02 at ea298cb298)
421
+ + t/perf: avoid copying worktree files from test repo
422
+ + t/perf: handle worktrees as test repos
423
+
424
+ Perf test update to work better in secondary worktrees.
425
+
426
+ Will cook in 'next'.
427
+
428
+
429
+* ps/update-ref-trans-hook-doc (2021-03-01) 2 commits
430
+ - githooks.txt: clarify documentation on reference-transaction hook
431
+ - githooks.txt: replace mentions of SHA-1 specific properties
432
+
433
+
434
+* tb/pack-revindex-on-disk (2021-02-26) 1 commit
435
+ - pack-revindex.c: don't close unopened file descriptors
436
+
437
+
438
+* zh/format-patch-fractional-reroll-count (2021-03-01) 1 commit
439
+ - format-patch: allow a non-integral version numbers
440
+
441
+
442
* ab/make-cleanup (2021-02-23) 6 commits
443
- Makefile: build "$(FUZZ_OBJS)" in CI, not under "all"
444
- Makefile: add {program,xdiff,test,git,fuzz}-objs & objects targets
@@ -705,21 +455,21 @@ Release tarballs are available at:
455
456
457
* ab/grep-pcre2-allocfix (2021-02-17) 10 commits
708
- - grep/pcre2: move definitions of pcre2_{malloc,free}
709
- - grep/pcre2: move back to thread-only PCREv2 structures
710
- - grep/pcre2: actually make pcre2 use custom allocator
711
- - grep/pcre2: use pcre2_maketables_free() function
712
- - grep/pcre2: use compile-time PCREv2 version test
713
- - grep/pcre2: add GREP_PCRE2_DEBUG_MALLOC debug mode
714
- - grep/pcre2: prepare to add debugging to pcre2_malloc()
715
- - grep/pcre2: correct reference to grep_init() in comment
716
- - grep/pcre2: drop needless assignment to NULL
717
- - grep/pcre2: drop needless assignment + assert() on opt->pcre2
458
+ (merged to 'next' on 2021-03-04 at 26d2b726b1)
459
+ + grep/pcre2: move definitions of pcre2_{malloc,free}
460
+ + grep/pcre2: move back to thread-only PCREv2 structures
461
+ + grep/pcre2: actually make pcre2 use custom allocator
462
+ + grep/pcre2: use pcre2_maketables_free() function
463
+ + grep/pcre2: use compile-time PCREv2 version test
464
+ + grep/pcre2: add GREP_PCRE2_DEBUG_MALLOC debug mode
465
+ + grep/pcre2: prepare to add debugging to pcre2_malloc()
466
+ + grep/pcre2: correct reference to grep_init() in comment
467
+ + grep/pcre2: drop needless assignment to NULL
468
+ + grep/pcre2: drop needless assignment + assert() on opt->pcre2
469
470
Updates to memory allocation code around the use of pcre2 library.
471
721
- Needs review.
722
- cf. <20210218000728.13995-1-avarab@gmail.com>
472
+ Will cook in 'next'.
473
474
475
* tb/reverse-midx (2021-02-24) 16 commits
@@ -862,6 +612,7 @@ Release tarballs are available at:
612
+ pkt-line: (optionally) libify the packet readers
613
+ pkt-line: do not issue flush packets in write_packetized_*()
614
+ pkt-line: eliminate the need for static buffer in packet_write_gently()
615
+ (this branch is used by jh/simple-ipc-cleanups.)
616
617
A simple IPC interface gets introduced to build services like
618
fsmonitor on top.
@@ -887,7 +638,13 @@ Release tarballs are available at:
638
Will cook in 'next', together with "cm/rebase-i-updates".
639
640
890
-* tb/geometric-repack (2021-02-22) 8 commits
641
+* tb/geometric-repack (2021-03-05) 13 commits
642
+ (merged to 'next' on 2021-03-08 at def1c48d43)
643
+ + builtin/repack.c: reword comment around pack-objects flags
644
+ + builtin/repack.c: be more conservative with unsigned overflows
645
+ + builtin/repack.c: assign pack split later
646
+ + t7703: test --geometric repack with loose objects
647
+ + builtin/repack.c: do not repack single packs with --geometric
648
(merged to 'next' on 2021-02-25 at a854fdbaff)
649
+ builtin/repack.c: add '--geometric' option
650
+ packfile: add kept-pack cache for find_kept_pack_entry()