What's cooking (2020/08 #01)
Junio C Hamano committed
Aug 3, 2020 at 22:34 UTC
1a62d9c42bb173fad40b52bbdb03fd208f427b9b
1 file changed
+202
-239
whats-cooking.txt
+202
-239
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jul 2020, #06; Thu, 30)
4
-X-master-at: 79bcaf006215b91de981c30c0268467e06faaf39
5
-X-next-at: 392f21bd87383fb9d4b700d1d69cb3af52040784
3
+Subject: What's cooking in git.git (Aug 2020, #01; Mon, 3)
4
+X-master-at: 85b4e0a6dc8407de6f69808d9ee6debdf167ced3
5
+X-next-at: 39fefa6b823f48851746819838919f3118e4317f
6
7
-What's cooking in git.git (Jul 2020, #06; Thu, 30)
7
+What's cooking in git.git (Aug 2020, #01; Mon, 3)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,13 +12,9 @@ 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
-Many topics that have been cooking in 'next' have now been merged to
16
-'master'. The tip of 'next' will be rewound and rebuilt on top of
17
-the updated 'master', perhaps tomorrow.
18
-
19
-During the next cycle for 2.29, we will decide the direction of
20
-follow-up work, if any is needed, for the init.defaultBranch topic
21
-we did the last cycle.
15
+Some topics that have been cooking in 'next' during the previous
16
+cycle, in addition to some fixes to 2.28, have been merged to
17
+'master', and the tip of 'next' has been rewound.
18
19
You can find the changes described here in the integration branches of the
20
repositories listed at
@@ -26,260 +22,167 @@ repositories listed at
22
http://git-blame.blogspot.com/p/git-public-repositories.html
23
24
--------------------------------------------------
29
-[Graduated to 'master']
25
+[New Topics]
26
31
-* bc/push-cas-cquoted-refname (2020-07-20) 1 commit
32
- (merged to 'next' on 2020-07-21 at fd7bb5c85e)
33
- + remote-curl: make --force-with-lease work with non-ASCII ref names
27
+* en/eol-attrs-gotchas (2020-08-03) 4 commits
28
+ - checkout: support renormalization with checkout -m <paths>
29
+ - merge: make merge.renormalize work for all uses of merge machinery
30
+ - t6038: remove problematic test
31
+ - t6038: make tests fail for the right reason
32
35
- Pushing a ref whose name contains non-ASCII character with the
36
- "--force-with-lease" option did not work over smart HTTP protocol,
37
- which has been corrected.
33
+ All "mergy" operations that internally use the merge-recursive
34
+ machinery should honor the merge.renormalize configuration, but
35
+ many of them didn't.
36
37
+ Will merge to 'next'.
38
40
-* bw/fail-cloning-into-non-empty (2020-07-10) 1 commit
41
- (merged to 'next' on 2020-07-14 at a52b5ce7ab)
42
- + git clone: don't clone into non-empty directory
39
44
- "git clone --separate-git-dir=$elsewhere" used to stomp on the
45
- contents of the existing directory $elsewhere, which has been
46
- taught to fail when $elsewhere is not an empty directory.
40
+* en/merge-recursive-comment-fixes (2020-08-02) 1 commit
41
+ - merge-recursive: fix unclear and outright wrong comments
42
43
+ Comment fix.
44
49
-* cc/pretty-contents-size (2020-07-16) 3 commits
50
- (merged to 'next' on 2020-07-20 at e7c4b8f9ae)
51
- + ref-filter: add support for %(contents:size)
52
- + t6300: test refs pointing to tree and blob
53
- + Documentation: clarify %(contents:XXXX) doc
45
+ Will merge to 'next'.
46
55
- "git for-each-ref --format=<>" learned %(contents:size).
47
48
+* es/adjust-subtree-test-for-merge-msg-update (2020-08-03) 1 commit
49
+ - Revert "contrib: subtree: adjust test to change in fmt-merge-msg"
50
58
-* ct/mv-unmerged-path-error (2020-07-20) 1 commit
59
- (merged to 'next' on 2020-07-21 at c17007237a)
60
- + git-mv: improve error message for conflicted file
51
+ Adjust tests in contrib/ to the recent change to fmt-merge-msg.
52
62
- "git mv src dst", when src is an unmerged path, errored out
63
- correctly but with an incorrect error message to claim that src is
64
- not tracked, which has been clarified.
53
+ Will merge to 'next'.
54
55
67
-* dl/test-must-fail-fixes-6 (2020-07-07) 6 commits
68
- (merged to 'next' on 2020-07-20 at bd4a9946a6)
69
- + test-lib-functions: restrict test_must_fail usage
70
- + t9400: don't use test_must_fail with cvs
71
- + t9834: remove use of `test_might_fail p4`
72
- + t7107: don't use test_must_fail()
73
- + t5324: reorder `run_with_limited_open_files test_might_fail`
74
- + t3701: stop using `env` in force_color()
56
+* es/worktree-cleanup (2020-07-31) 4 commits
57
+ - worktree: retire special-case normalization of main worktree path
58
+ - worktree: drop bogus and unnecessary path munging
59
+ - worktree: drop unused code from get_linked_worktree()
60
+ - worktree: drop pointless strbuf_release()
61
76
- Dev support to limit the use of test_must_fail to only git commands.
62
+ Code cleanup around "worktree" API implementation.
63
64
+ Will merge to 'next'.
65
79
-* ds/commit-graph-bloom-updates (2020-07-01) 10 commits
80
- (merged to 'next' on 2020-07-06 at 177e6b362e)
81
- + commit-graph: check all leading directories in changed path Bloom filters
82
- + revision: empty pathspecs should not use Bloom filters
83
- + revision.c: fix whitespace
84
- + commit-graph: check chunk sizes after writing
85
- + commit-graph: simplify chunk writes into loop
86
- + commit-graph: unify the signatures of all write_graph_chunk_*() functions
87
- + commit-graph: persist existence of changed-paths
88
- + bloom: fix logic in get_bloom_filter()
89
- + commit-graph: change test to die on parse, not load
90
- + commit-graph: place bloom_settings in context
91
- (this branch uses sg/commit-graph-cleanups.)
66
93
- Updates to the changed-paths bloom filter.
67
+* es/worktree-doc-cleanups (2020-08-03) 5 commits
68
+ - git-worktree.txt: link to man pages when citing other Git commands
69
+ - git-worktree.txt: make start of new sentence more obvious
70
+ - git-worktree.txt: fix minor grammatical issues
71
+ - git-worktree.txt: consistently use term "working tree"
72
+ - git-worktree.txt: employ fixed-width typeface consistently
73
74
+ Doc cleanup around "worktree".
75
96
-* en/fill-directory-exponential (2020-07-20) 1 commit
97
- (merged to 'next' on 2020-07-22 at 63662d6646)
98
- + dir: check pathspecs before returning `path_excluded`
76
+ Will merge to 'next'.
77
100
- Fix to a regression introduced during 2.27 cycle.
78
79
+* ma/t1450-quotefix (2020-08-01) 1 commit
80
+ - t1450: fix quoting of NUL byte when corrupting pack
81
103
-* hn/reftable (2020-07-10) 4 commits
104
- (merged to 'next' on 2020-07-14 at e524883fec)
105
- + reflog: cleanse messages in the refs.c layer
106
- + bisect: treat BISECT_HEAD as a pseudo ref
107
- + t3432: use git-reflog to inspect the reflog for HEAD
108
- + lib-t6000.sh: write tag using git-update-ref
109
- (this branch is used by hn/reftable-prep-part-2.)
82
+ Test fix.
83
111
- Preliminary clean-up of the refs API in preparation for adding a
112
- new refs backend "reftable".
84
+ Will merge to 'next'.
85
86
115
-* jk/reject-newer-extensions-in-v0 (2020-07-16) 1 commit
116
- (merged to 'next' on 2020-07-16 at 85f634d5a6)
117
- + verify_repository_format(): complain about new extensions in v0 repo
87
+* ny/notes-doc-sample-update (2020-08-03) 1 commit
88
+ - docs: improve the example that illustrates git-notes path names
89
119
- With the base fix to 2.27 regresion, any new extensions in a v0
120
- repository would still be silently honored, which is not quite
121
- right. Instead, complain and die loudly.
90
+ Doc updates.
91
92
+ Will merge to 'next'.
93
124
-* jk/tests-timestamp-fix (2020-07-15) 6 commits
125
- (merged to 'next' on 2020-07-16 at 2c69e97b92)
126
- + t9100: stop depending on commit timestamps
127
- (merged to 'next' on 2020-07-14 at 66ee0e6b45)
128
- + test-lib: set deterministic default author/committer date
129
- + t9100: explicitly unset GIT_COMMITTER_DATE
130
- + t5539: make timestamp requirements more explicit
131
- + t9700: loosen ident timezone regex
132
- (merged to 'next' on 2020-07-09 at 633bcd552f)
133
- + t6000: use test_tick consistently
94
135
- The test framework has been updated so that most tests will run
136
- with predictable (artificial) timestamps.
95
+* pb/guide-docs (2020-08-02) 4 commits
96
+ - SQUASH???
97
+ - git.txt: add list of guides
98
+ - help: drop usage of 'common' and 'useful' for guides
99
+ - command-list.txt: add missing 'gitcredentials' and 'gitremote-helpers'
100
+
101
+ Update "git help guides" documentation organization.
102
103
139
-* jt/avoid-lazy-fetching-upon-have-check (2020-07-16) 1 commit
140
- (merged to 'next' on 2020-07-20 at 28e85288e5)
141
- + upload-pack: do not lazy-fetch "have" objects
104
+* rs/bisect-oid-to-hex-fix (2020-08-02) 1 commit
105
+ - bisect: use oid_to_hex_r() instead of memcpy()+oid_to_hex()
106
143
- Fetching from a lazily cloned repository resulted at the server
144
- side in attempts to lazy fetch objects that the client side has,
145
- many of which will not be available from the third-party anyway.
107
+ Code cleanup.
108
109
+ Will merge to 'next'.
110
148
-* pb/log-rev-list-doc (2020-07-08) 6 commits
149
- (merged to 'next' on 2020-07-14 at f1104dfb77)
150
- + git-log.txt: include rev-list-description.txt
151
- + git-rev-list.txt: move description to separate file
152
- + git-rev-list.txt: tweak wording in set operations
153
- + git-rev-list.txt: fix Asciidoc syntax
154
- + revisions.txt: describe 'rev1 rev2 ...' meaning for ranges
155
- + git-log.txt: add links to 'rev-list' and 'diff' docs
111
157
- "git help log" has been enhanced by sharing more material from the
158
- documentation for the underlying "git rev-list" command.
112
+* rs/more-buffered-io (2020-08-02) 3 commits
113
+ - upload-pack: use buffered I/O to talk to rev-list
114
+ - midx: use buffered I/O to talk to pack-objects
115
+ - connected: use buffered I/O to talk to rev-list
116
117
+--------------------------------------------------
118
+[Graduated to 'master']
119
161
-* rs/add-index-entry-optim-fix (2020-07-16) 1 commit
162
- (merged to 'next' on 2020-07-20 at 617fe6aecc)
163
- + read-cache: remove bogus shortcut
120
+* ar/help-guides-doc (2020-07-29) 1 commit
121
+ (merged to 'next' on 2020-07-30 at e4b0370bfa)
122
+ + git-help.txt: fix mentions of option --guides
123
165
- Fix to an ancient bug caused by an over-eager attempt for
166
- optimization.
124
+ Doc update.
125
126
169
-* sg/commit-graph-cleanups (2020-06-08) 10 commits
170
- (merged to 'next' on 2020-07-06 at 15c9d77eb9)
171
- + commit-graph: simplify write_commit_graph_file() #2
172
- + commit-graph: simplify write_commit_graph_file() #1
173
- + commit-graph: simplify parse_commit_graph() #2
174
- + commit-graph: simplify parse_commit_graph() #1
175
- + commit-graph: clean up #includes
176
- + diff.h: drop diff_tree_oid() & friends' return value
177
- + commit-slab: add a function to deep free entries on the slab
178
- + commit-graph-format.txt: all multi-byte numbers are in network byte order
179
- + commit-graph: fix parsing the Chunk Lookup table
180
- + tree-walk.c: don't match submodule entries for 'submod/anything'
181
- (this branch is used by ds/commit-graph-bloom-updates.)
127
+* cc/pretty-contents-size (2020-07-31) 1 commit
128
+ (merged to 'next' on 2020-07-31 at 0ad958f31d)
129
+ + t6300: fix issues related to %(contents:size)
130
183
- The changed-path Bloom filter is improved using ideas from an
184
- independent implementation.
131
+ Brown-paper-bag fix.
132
186
---------------------------------------------------
187
-[New Topics]
133
134
* en/typofixes (2020-07-28) 2 commits
135
(merged to 'next' on 2020-07-30 at 64776daa9a)
136
+ hashmap: fix typo in usage docs
137
+ Remove doubled words in various comments
138
194
- Will merge to 'master'.
139
+ Typofixes.
140
141
197
-* jk/log-fp-implies-m (2020-07-29) 7 commits
198
- - doc/git-log: clarify handling of merge commit diffs
199
- - doc/git-log: move "-t" into diff-options list
200
- - doc/git-log: drop "-r" diff option
201
- - doc/git-log: move "Diff Formatting" from rev-list-options
202
- - log: enable "-m" automatically with "--first-parent"
203
- - revision: add "--no-diff-merges" option to counteract "-m"
204
- - log: drop "--cc implies -m" logic
142
+* hn/reftable (2020-07-31) 1 commit
143
+ (merged to 'next' on 2020-07-31 at 9e34be957e)
144
+ + refs: move the logic to add \t to reflog to the files backend
145
206
- "git log --first-parent -p" showed patches only for single-parent
207
- commits on the first-parent chain; the "--first-parent" option has
208
- been made to imply "-m". Use "--no-diff-merges" to restore the
209
- previous behaviour to omit patches for merge commits.
146
+ Brown-paper-bag fix.
147
211
- Will merge to 'next'.
148
149
+* jb/doc-packfile-name (2020-07-22) 1 commit
150
+ (merged to 'next' on 2020-07-30 at b46c3f6675)
151
+ + pack-write/docs: update regarding pack naming
152
214
-* jk/strvec (2020-07-28) 11 commits
215
- - strvec: rename struct fields
216
- - strvec: drop argv_array compatibility layer
217
- - strvec: update documention to avoid argv_array
218
- - strvec: fix indentation in renamed calls
219
- - strvec: convert remaining callers away from argv_array name
220
- - strvec: convert more callers away from argv_array name
221
- - strvec: convert builtin/ callers away from argv_array name
222
- - quote: rename sq_dequote_to_argv_array to mention strvec
223
- - strvec: rename files from argv-array to strvec
224
- - argv-array: rename to strvec
225
- - argv-array: use size_t for count and alloc
153
+ Doc update.
154
227
- The argv_array API is useful for not just managing argv but any
228
- "vector" (NULL-terminated array) of strings, and has seen adoption
229
- to a certain degree. It has been renamed to "strvec" to reduce the
230
- barrier to adoption.
155
232
- Will merge to 'next'.
156
+* jc/fmt-merge-msg-suppress-destination (2020-07-30) 2 commits
157
+ (merged to 'next' on 2020-07-30 at c44f57f46d)
158
+ + fmt-merge-msg: allow merge destination to be omitted again
159
+ + Revert "fmt-merge-msg: stop treating `master` specially"
160
+
161
+ "git merge" learned to selectively omit " into <branch>" at the end
162
+ of the title of default merge message with merge.suppressDest
163
+ configuration.
164
165
166
* rs/grep-simpler-parse-object-or-die-call (2020-07-28) 1 commit
167
(merged to 'next' on 2020-07-30 at 6d22dd3058)
168
+ grep: avoid using oid_to_hex() with parse_object_or_die()
169
239
- Will merge to 'master'.
170
+ Code clean-up.
171
172
242
-* ar/help-guides-doc (2020-07-29) 1 commit
243
- (merged to 'next' on 2020-07-30 at e4b0370bfa)
244
- + git-help.txt: fix mentions of option --guides
173
+* sg/ci-git-path-fix-with-pyenv (2020-07-23) 1 commit
174
+ (merged to 'next' on 2020-07-30 at afe304633d)
175
+ + ci: use absolute PYTHON_PATH in the Linux jobs
176
246
- Will merge to 'master'.
177
+ CI fixup---tests of Python scripts didn't use the version of Git
178
+ that is being tested.
179
180
181
* sk/typofixes (2020-07-29) 1 commit
182
(merged to 'next' on 2020-07-30 at c56d9e5313)
183
+ comment: fix spelling mistakes inside comments
184
253
- Will merge to 'master'.
254
-
255
-
256
-* pd/mergetool-nvimdiff (2020-07-29) 2 commits
257
- - mergetools: add support for nvimdiff (neovim) family
258
- - mergetool--lib: improve support for vimdiff-style tool variants
259
-
260
- The existing backends for "git mergetool" based on variants of vim
261
- have been refactored and then support for "nvim" has been added.
262
-
263
-
264
-* al/bisect-first-parent (2020-07-29) 3 commits
265
- - bisect: combine args passed to find_bisection()
266
- - bisect: introduce first-parent flag
267
- - rev-list: allow bisect and first-parent flags
268
-
269
- "git bisect" learns the "--first-parent" option to find the first
270
- breakage along the first-parent chain.
271
-
272
-
273
-* jc/fmt-merge-msg-suppress-destination (2020-07-30) 2 commits
274
- (merged to 'next' on 2020-07-30 at c44f57f46d)
275
- + fmt-merge-msg: allow merge destination to be omitted again
276
- + Revert "fmt-merge-msg: stop treating `master` specially"
277
-
278
- "git merge" learned to selectively omit " into <branch>" at the end
279
- of the title of default merge message with merge.suppressDest
280
- configuration.
281
-
282
- Will merge to 'master'.
185
+ Typofixes.
186
187
--------------------------------------------------
188
[Stalled]
@@ -361,13 +264,67 @@ repositories listed at
264
--------------------------------------------------
265
[Cooking]
266
364
-* jb/doc-packfile-name (2020-07-22) 1 commit
365
- (merged to 'next' on 2020-07-30 at b46c3f6675)
366
- + pack-write/docs: update regarding pack naming
267
+* jk/log-fp-implies-m (2020-07-29) 7 commits
268
+ (merged to 'next' on 2020-08-03 at 39fefa6b82)
269
+ + doc/git-log: clarify handling of merge commit diffs
270
+ + doc/git-log: move "-t" into diff-options list
271
+ + doc/git-log: drop "-r" diff option
272
+ + doc/git-log: move "Diff Formatting" from rev-list-options
273
+ + log: enable "-m" automatically with "--first-parent"
274
+ + revision: add "--no-diff-merges" option to counteract "-m"
275
+ + log: drop "--cc implies -m" logic
276
368
- Doc update.
277
+ Originally merged to 'next' on 2020-08-01
278
370
- Will merge to 'master'.
279
+ "git log --first-parent -p" showed patches only for single-parent
280
+ commits on the first-parent chain; the "--first-parent" option has
281
+ been made to imply "-m". Use "--no-diff-merges" to restore the
282
+ previous behaviour to omit patches for merge commits.
283
+
284
+ Waiting for the discussion to settle.
285
+ cf. <87lfivqvgf.fsf@osv.gnss.ru>
286
+ If Sergey wants to send in --diff-merges=(none|<num>|c|cc|all)
287
+ enhancement reasonably soon, I do not mind holding this off for a
288
+ bit longer out of 'master'.
289
+
290
+
291
+* jk/strvec (2020-07-30) 11 commits
292
+ - strvec: rename struct fields
293
+ - strvec: drop argv_array compatibility layer
294
+ - strvec: update documention to avoid argv_array
295
+ - strvec: fix indentation in renamed calls
296
+ - strvec: convert remaining callers away from argv_array name
297
+ - strvec: convert more callers away from argv_array name
298
+ - strvec: convert builtin/ callers away from argv_array name
299
+ - quote: rename sq_dequote_to_argv_array to mention strvec
300
+ - strvec: rename files from argv-array to strvec
301
+ - argv-array: rename to strvec
302
+ - argv-array: use size_t for count and alloc
303
+ (this branch is used by ds/maintenance.)
304
+
305
+ The argv_array API is useful for not just managing argv but any
306
+ "vector" (NULL-terminated array) of strings, and has seen adoption
307
+ to a certain degree. It has been renamed to "strvec" to reduce the
308
+ barrier to adoption.
309
+
310
+ Will merge to 'next'.
311
+
312
+
313
+* pd/mergetool-nvimdiff (2020-07-29) 2 commits
314
+ - mergetools: add support for nvimdiff (neovim) family
315
+ - mergetool--lib: improve support for vimdiff-style tool variants
316
+
317
+ The existing backends for "git mergetool" based on variants of vim
318
+ have been refactored and then support for "nvim" has been added.
319
+
320
+
321
+* al/bisect-first-parent (2020-07-29) 3 commits
322
+ - bisect: combine args passed to find_bisection()
323
+ - bisect: introduce first-parent flag
324
+ - rev-list: allow bisect and first-parent flags
325
+
326
+ "git bisect" learns the "--first-parent" option to find the first
327
+ breakage along the first-parent chain.
328
329
330
* dd/send-email-config (2020-07-23) 1 commit
@@ -378,8 +335,11 @@ repositories listed at
335
336
337
* jt/pack-objects-prefetch-in-batch (2020-07-21) 2 commits
381
- - pack-objects: prefetch objects to be packed
382
- - pack-objects: refactor to oid_object_info_extended
338
+ (merged to 'next' on 2020-08-03 at 29424e614d)
339
+ + pack-objects: prefetch objects to be packed
340
+ + pack-objects: refactor to oid_object_info_extended
341
+
342
+ Originally merged to 'next' on 2020-08-01
343
344
While packing many objects in a repository with a promissor remote,
345
lazily fetching missing objects from the promissor remote one by
@@ -388,27 +348,20 @@ repositories listed at
348
clone that lazily fetches tree objects as you cannot even enumerate
349
what blobs are missing until you learn which trees are missing).
350
391
- Will merge to 'next'.
351
+ Will merge to 'master'.
352
353
354
* jt/pretend-object-never-come-from-elsewhere (2020-07-21) 1 commit
395
- - sha1-file: make pretend_object_file() not prefetch
355
+ (merged to 'next' on 2020-08-03 at 36cd23aae5)
356
+ + sha1-file: make pretend_object_file() not prefetch
357
+
358
+ Originally merged to 'next' on 2020-08-01
359
360
The pretend-object mechanism checks if the given object already
361
exists in the object store before deciding to keep the data
362
in-core, but the check would have triggered lazy fetching of such
363
an object from a promissor remote.
364
402
- Will merge to 'next'.
403
-
404
-
405
-* sg/ci-git-path-fix-with-pyenv (2020-07-23) 1 commit
406
- (merged to 'next' on 2020-07-30 at afe304633d)
407
- + ci: use absolute PYTHON_PATH in the Linux jobs
408
-
409
- CI fixup---tests of Python scripts didn't use the version of Git
410
- that is being tested.
411
-
365
Will merge to 'master'.
366
367
@@ -458,21 +411,15 @@ repositories listed at
411
Will merge to 'next'.
412
413
461
-* jc/no-update-fetch-head (2020-07-29) 1 commit
462
- - fetch: optionally allow disabling FETCH_HEAD update
463
-
464
- "git fetch" learned the "--[no-]write-fetch-head" option to
465
- optionally stop describing what was fetched in FETCH_HEAD.
466
-
467
- Needs more work.
468
-
469
-
414
* mp/complete-show-color-moved (2020-07-15) 1 commit
471
- - completion: add show --color-moved[-ws]
415
+ (merged to 'next' on 2020-08-03 at c90fea8e5e)
416
+ + completion: add show --color-moved[-ws]
417
+
418
+ Originally merged to 'next' on 2020-08-01
419
420
Command line completion (in contrib/) update.
421
475
- Will merge to 'next'.
422
+ Will merge to 'master'.
423
A follow-up patch to reduce duplication may be warranted.
424
425
@@ -484,7 +431,7 @@ repositories listed at
431
Further preliminary change to refs API.
432
433
487
-* ds/maintenance (2020-07-23) 18 commits
434
+* ds/maintenance (2020-07-30) 20 commits
435
- maintenance: add trace2 regions for task execution
436
- midx: use start_delayed_progress()
437
- maintenance: add incremental-repack auto condition
@@ -494,8 +441,10 @@ repositories listed at
441
- maintenance: create maintenance.<task>.enabled config
442
- maintenance: auto-size incremental-repack batch
443
- maintenance: add incremental-repack task
444
+ - midx: enable core.multiPackIndex by default
445
- maintenance: add loose-objects task
446
- maintenance: add prefetch task
447
+ - fetch: optionally allow disabling FETCH_HEAD update
448
- maintenance: take a lock on the objects directory
449
- maintenance: add --task option
450
- maintenance: add commit-graph task
@@ -503,6 +452,7 @@ repositories listed at
452
- maintenance: replace run_auto_gc()
453
- maintenance: add --quiet option
454
- maintenance: create basic maintenance runner
455
+ (this branch uses jk/strvec.)
456
457
A "git gc"'s big brother has been introduced to take care of more
458
repository maintenance tasks, not limited to the object database
@@ -520,9 +470,8 @@ repositories listed at
470
Expecting a reroll.
471
472
523
-* tb/upload-pack-filters (2020-07-22) 4 commits
473
+* tb/upload-pack-filters (2020-08-03) 3 commits
474
- upload-pack.c: introduce 'uploadpackfilter.tree.maxDepth'
525
- - upload-pack.c: pass 'struct list_objects_filter_options *'
475
- upload-pack.c: allow banning certain object filter(s)
476
- list_objects_filter_options: introduce 'list_object_filter_config_name'
477
@@ -530,6 +479,8 @@ repositories listed at
479
configurable to selectively allow or reject object filtering
480
specification used for partial cloning.
481
482
+ Will merge to 'next'.
483
+
484
485
* mt/hash-to-hex-thread-safety (2020-06-26) 2 commits
486
- hex: make hash_to_hex_algop() and friends thread-safe
@@ -544,22 +495,27 @@ repositories listed at
495
496
497
* ss/cmake-build (2020-06-26) 8 commits
547
- - ci: modification of main.yml to use cmake for vs-build job
548
- - cmake: support for building git on windows with msvc and clang.
549
- - cmake: support for building git on windows with mingw
550
- - cmake: support for testing git when building out of the source tree
551
- - cmake: support for testing git with ctest
552
- - cmake: installation support for git
553
- - cmake: generate the shell/perl/python scripts and templates, translations
554
- - Introduce CMake support for configuring Git
498
+ (merged to 'next' on 2020-08-03 at a0d70165c1)
499
+ + ci: modification of main.yml to use cmake for vs-build job
500
+ + cmake: support for building git on windows with msvc and clang.
501
+ + cmake: support for building git on windows with mingw
502
+ + cmake: support for testing git when building out of the source tree
503
+ + cmake: support for testing git with ctest
504
+ + cmake: installation support for git
505
+ + cmake: generate the shell/perl/python scripts and templates, translations
506
+ + Introduce CMake support for configuring Git
507
+
508
+ Originally merged to 'next' on 2020-08-01
509
510
CMake support to build with MSVC for Windows bypassing the Makefile.
511
558
- Will merge to 'next'.
512
+ Will merge to 'master'.
513
cf. https://github.com/git/git/runs/892824895
514
515
562
-* es/config-hooks (2020-07-29) 4 commits
516
+* es/config-hooks (2020-07-30) 6 commits
517
+ - hook: add 'run' subcommand
518
+ - parse-options: parse into argv_array
519
- hook: add --porcelain to list command
520
- hook: add list command
521
- hook: scaffolding for git-hook subcommand
@@ -567,8 +523,6 @@ repositories listed at
523
524
The "hooks defined in config" topic.
525
570
- What's the status of this one? Abandoned?
571
-
526
527
* pw/rebase-i-more-options (2020-07-16) 5 commits
528
- rebase: add --reset-author-date
@@ -619,3 +573,12 @@ repositories listed at
573
Test update.
574
575
Now it is part of jk/tests-timestamp-fix with a larger scope.
576
+
577
+
578
+* jc/no-update-fetch-head (2020-07-29) 1 commit
579
+ . fetch: optionally allow disabling FETCH_HEAD update
580
+
581
+ "git fetch" learned the "--[no-]write-fetch-head" option to
582
+ optionally stop describing what was fetched in FETCH_HEAD.
583
+
584
+ Now it is part of ds/maintenance topic.