What's cooking (2020/08 #02)
Junio C Hamano committed
Aug 10, 2020 at 12:43 UTC
43a51fdd44d4368810e7d83645a5cd9c500a7cc3
1 file changed
+343
-255
whats-cooking.txt
+343
-255
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Aug 2020, #01; Mon, 3)
4
-X-master-at: 85b4e0a6dc8407de6f69808d9ee6debdf167ced3
5
-X-next-at: 39fefa6b823f48851746819838919f3118e4317f
3
+Subject: What's cooking in git.git (Aug 2020, #02; Mon, 10)
4
+X-master-at: 4f0a8be78499454eac3985b6e7e144b8376ab0a5
5
+X-next-at: 1739fa56f16d224373590068a68d990fb82ab9d0
6
7
-What's cooking in git.git (Aug 2020, #01; Mon, 3)
7
+What's cooking in git.git (Aug 2020, #02; Mon, 10)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,181 +12,351 @@ 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
-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
-
15
You can find the changes described here in the integration branches of the
16
repositories listed at
17
18
http://git-blame.blogspot.com/p/git-public-repositories.html
19
20
--------------------------------------------------
25
-[New Topics]
21
+[Graduated to 'master']
22
23
* 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
24
+ (merged to 'next' on 2020-08-05 at 46e73f4c94)
25
+ + checkout: support renormalization with checkout -m <paths>
26
+ + merge: make merge.renormalize work for all uses of merge machinery
27
+ + t6038: remove problematic test
28
+ + t6038: make tests fail for the right reason
29
30
All "mergy" operations that internally use the merge-recursive
31
machinery should honor the merge.renormalize configuration, but
32
many of them didn't.
33
37
- Will merge to 'next'.
38
-
34
35
* en/merge-recursive-comment-fixes (2020-08-02) 1 commit
41
- - merge-recursive: fix unclear and outright wrong comments
36
+ (merged to 'next' on 2020-08-04 at ec14b8ea94)
37
+ + merge-recursive: fix unclear and outright wrong comments
38
39
Comment fix.
40
45
- Will merge to 'next'.
46
-
41
42
* 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"
43
+ (merged to 'next' on 2020-08-04 at 634b1fcbac)
44
+ + Revert "contrib: subtree: adjust test to change in fmt-merge-msg"
45
46
Adjust tests in contrib/ to the recent change to fmt-merge-msg.
47
53
- Will merge to 'next'.
54
-
48
49
* 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()
50
+ (merged to 'next' on 2020-08-04 at 798f642f66)
51
+ + worktree: retire special-case normalization of main worktree path
52
+ + worktree: drop bogus and unnecessary path munging
53
+ + worktree: drop unused code from get_linked_worktree()
54
+ + worktree: drop pointless strbuf_release()
55
56
Code cleanup around "worktree" API implementation.
57
64
- Will merge to 'next'.
58
59
+* jk/compiler-fixes-and-workarounds (2020-08-04) 3 commits
60
+ (merged to 'next' on 2020-08-04 at a1caf8edbc)
61
+ + revision: avoid leak when preparing bloom filter for "/"
62
+ + revision: avoid out-of-bounds read/write on empty pathspec
63
+ + config: work around gcc-10 -Wstringop-overflow warning
64
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
65
+ Small fixes and workarounds.
66
74
- Doc cleanup around "worktree".
67
76
- Will merge to 'next'.
68
+* jk/strvec (2020-07-30) 11 commits
69
+ (merged to 'next' on 2020-08-04 at 61addb841f)
70
+ + strvec: rename struct fields
71
+ + strvec: drop argv_array compatibility layer
72
+ + strvec: update documention to avoid argv_array
73
+ + strvec: fix indentation in renamed calls
74
+ + strvec: convert remaining callers away from argv_array name
75
+ + strvec: convert more callers away from argv_array name
76
+ + strvec: convert builtin/ callers away from argv_array name
77
+ + quote: rename sq_dequote_to_argv_array to mention strvec
78
+ + strvec: rename files from argv-array to strvec
79
+ + argv-array: rename to strvec
80
+ + argv-array: use size_t for count and alloc
81
+ (this branch is used by ds/maintenance and ds/maintenance-part-2.)
82
+
83
+ The argv_array API is useful for not just managing argv but any
84
+ "vector" (NULL-terminated array) of strings, and has seen adoption
85
+ to a certain degree. It has been renamed to "strvec" to reduce the
86
+ barrier to adoption.
87
+
88
+
89
+* jt/pack-objects-prefetch-in-batch (2020-07-21) 2 commits
90
+ (merged to 'next' on 2020-08-03 at 29424e614d)
91
+ + pack-objects: prefetch objects to be packed
92
+ + pack-objects: refactor to oid_object_info_extended
93
+
94
+ Originally merged to 'next' on 2020-08-01
95
+
96
+ While packing many objects in a repository with a promissor remote,
97
+ lazily fetching missing objects from the promissor remote one by
98
+ one may be inefficient---the code now attempts to fetch all the
99
+ missing objects in batch (obviously this won't work for a lazy
100
+ clone that lazily fetches tree objects as you cannot even enumerate
101
+ what blobs are missing until you learn which trees are missing).
102
+
103
+
104
+* jt/pretend-object-never-come-from-elsewhere (2020-07-21) 1 commit
105
+ (merged to 'next' on 2020-08-03 at 36cd23aae5)
106
+ + sha1-file: make pretend_object_file() not prefetch
107
+
108
+ Originally merged to 'next' on 2020-08-01
109
+
110
+ The pretend-object mechanism checks if the given object already
111
+ exists in the object store before deciding to keep the data
112
+ in-core, but the check would have triggered lazy fetching of such
113
+ an object from a promissor remote.
114
115
116
* ma/t1450-quotefix (2020-08-01) 1 commit
80
- - t1450: fix quoting of NUL byte when corrupting pack
117
+ (merged to 'next' on 2020-08-04 at 0e762e3553)
118
+ + t1450: fix quoting of NUL byte when corrupting pack
119
120
Test fix.
121
84
- Will merge to 'next'.
122
+
123
+* mp/complete-show-color-moved (2020-07-15) 1 commit
124
+ (merged to 'next' on 2020-08-03 at c90fea8e5e)
125
+ + completion: add show --color-moved[-ws]
126
+
127
+ Originally merged to 'next' on 2020-08-01
128
+
129
+ Command line completion (in contrib/) update.
130
+ A follow-up patch to reduce duplication may be warranted.
131
132
133
* ny/notes-doc-sample-update (2020-08-03) 1 commit
88
- - docs: improve the example that illustrates git-notes path names
134
+ (merged to 'next' on 2020-08-04 at a63dcb2c55)
135
+ + docs: improve the example that illustrates git-notes path names
136
137
Doc updates.
138
92
- Will merge to 'next'.
93
-
139
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'
140
+* pb/guide-docs (2020-08-04) 4 commits
141
+ (merged to 'next' on 2020-08-05 at 031cab2bc2)
142
+ + git.txt: add list of guides
143
+ + Documentation: don't hardcode command categories twice
144
+ + help: drop usage of 'common' and 'useful' for guides
145
+ + command-list.txt: add missing 'gitcredentials' and 'gitremote-helpers'
146
147
Update "git help guides" documentation organization.
148
149
150
* rs/bisect-oid-to-hex-fix (2020-08-02) 1 commit
105
- - bisect: use oid_to_hex_r() instead of memcpy()+oid_to_hex()
151
+ (merged to 'next' on 2020-08-04 at dc3c8ea699)
152
+ + bisect: use oid_to_hex_r() instead of memcpy()+oid_to_hex()
153
154
Code cleanup.
155
109
- Will merge to 'next'.
156
157
+* so/rev-parser-errormessage-fix (2020-08-04) 1 commit
158
+ (merged to 'next' on 2020-08-05 at dd9653da77)
159
+ + revision: fix die() message for "--unpacked="
160
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
161
+ Error message fix.
162
163
--------------------------------------------------
118
-[Graduated to 'master']
164
+[New Topics]
165
+
166
+* bc/sha-256-cvs-svn-updates (2020-08-05) 1 commit
167
+ (merged to 'next' on 2020-08-07 at b1ce7e5ec5)
168
+ + git-cvsexportcommit: support Perl before 5.10.1
169
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
170
+ Portability fix.
171
124
- Doc update.
172
+ Will merge to 'master'.
173
+
174
+
175
+* ds/maintenance-part-2 (2020-08-06) 9 commits
176
+ - maintenance: add incremental-repack auto condition
177
+ - maintenance: auto-size incremental-repack batch
178
+ - maintenance: add incremental-repack task
179
+ - midx: use start_delayed_progress()
180
+ - midx: enable core.multiPackIndex by default
181
+ - maintenance: create auto condition for loose-objects
182
+ - maintenance: add loose-objects task
183
+ - maintenance: add prefetch task
184
+ - fetch: optionally allow disabling FETCH_HEAD update
185
+ (this branch uses ds/maintenance.)
186
+
187
+
188
+* jt/has_object (2020-08-06) 4 commits
189
+ (merged to 'next' on 2020-08-07 at ed08abb693)
190
+ + fsck: do not lazy fetch known non-promisor object
191
+ + pack-objects: no fetch when allow-{any,promisor}
192
+ + apply: do not lazy fetch when applying binary
193
+ + sha1-file: introduce no-lazy-fetch has_object()
194
+
195
+ A new helper function has_object() has been introduced to make it
196
+ easier to mark object existence checks that do and don't want to
197
+ trigger lazy fetches, and a few such checks are converted using it.
198
+
199
+ Will merge to 'master'.
200
201
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)
202
+* ma/doc-sha-256-is-experimental (2020-08-06) 1 commit
203
+ - Documentation: mark `--object-format=sha256` as experimental
204
131
- Brown-paper-bag fix.
205
+ The recent addition of SHA-256 support is marked as experimental in
206
+ the documentation.
207
208
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
209
+* ma/test-quote-cleanup (2020-08-06) 2 commits
210
+ (merged to 'next' on 2020-08-10 at 63a95c2926)
211
+ + t4104: modernize and simplify quoting
212
+ + t: don't spuriously close and reopen quotes
213
139
- Typofixes.
214
+ Test cleanup.
215
+
216
+ Will merge to 'master'.
217
218
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
219
+* rp/apply-cached-with-i-t-a (2020-08-09) 3 commits
220
+ - t4140: test apply with i-t-a paths
221
+ - apply: make i-t-a entries never match worktree
222
+ - apply: allow "new file" patches on i-t-a entries
223
146
- Brown-paper-bag fix.
224
+ Recent versions of "git diff-files" shows a diff between the index
225
+ and the working tree for "intent-to-add" paths as a "new file"
226
+ patch; "git apply --cached" should be able to take "git diff-files"
227
+ and should act as an equivalent to "git add" for the path, but the
228
+ command failed to do so for such a path.
229
230
+ Will merge to 'next'.
231
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
232
153
- Doc update.
233
+* rp/blame-first-parent-doc (2020-08-06) 1 commit
234
+ (merged to 'next' on 2020-08-10 at 3fdbebe1ea)
235
+ + blame-options.txt: document --first-parent option
236
237
+ The "git blame --first-parent" option was not documented, but now
238
+ it is.
239
+
240
+ Will merge to 'master'.
241
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"
242
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.
243
+* jc/noop-withstatic-inline (2020-08-06) 1 commit
244
+ - compat-util: type-check parameters of no-op replacement functions
245
246
+ A no-op replacement function implemented as a C preprocessor macro
247
+ does not perform as good a job as one implemented as a "static
248
+ inline" function in catching errors in parameters; replace the
249
+ former with the latter in <git-compat-util.h> header.
250
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()
251
170
- Code clean-up.
252
+* ps/ref-transaction-hook (2020-08-07) 1 commit
253
+ (merged to 'next' on 2020-08-10 at d8ad7cc8f6)
254
+ + refs: fix interleaving hook calls with reference-transaction hook
255
+
256
+ The logic to find the ref transaction hook script attempted to
257
+ cache the path to the found hook without realizing that it needed
258
+ to keep a copied value, as the API it used returned a transitory
259
+ buffer space. This has been corrected.
260
+
261
+ Will merge to 'master'.
262
+ to be followed by a removal of the caching feature, which does not
263
+ seem to help even as a negative cache.
264
+
265
266
+* ss/submodule-summary-in-c (2020-08-06) 5 commits
267
+ - submodule: port submodule subcommand 'summary' from shell to C
268
+ - t7421: introduce a test script for verifying 'summary' output
269
+ - submodule: rename helper functions to avoid ambiguity
270
+ - submodule: remove extra line feeds between callback struct and macro
271
+ - submodule: expose the '--for-status' option of summary
272
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
273
+ Yet another subcommand of "git submodule" is getting rewritten in C.
274
177
- CI fixup---tests of Python scripts didn't use the version of Git
178
- that is being tested.
275
276
+* am/ci-wsfix (2020-08-10) 1 commit
277
+ - ci: fix inconsistent indentation
278
+
279
+
280
+* es/init-no-separate-git-dir-in-bare (2020-08-10) 1 commit
281
+ - init: disallow --separate-git-dir with bare repository
282
+
283
+ "git init --separate-git-dir" can be used in an existing repository
284
+ with a working tree to move its .git/ directory away from the
285
+ working tree. Even though this re-init feature makes no sense in
286
+ an existing bare repository, it was not erroring out. Now it does.
287
+
288
+
289
+* es/test-cmp-typocatcher (2020-08-09) 1 commit
290
+ - test_cmp: diagnose incorrect arguments
291
+
292
+ Test framework update.
293
+
294
+ Will merge to 'next'.
295
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
296
185
- Typofixes.
297
+* jk/sideband-error-l10n (2020-08-07) 1 commit
298
+ - sideband: mark "remote error:" prefix for translation
299
+
300
+ Mark error message for i18n.
301
+
302
+ Will merge to 'next'.
303
+
304
+
305
+* rp/ita-diff-modefix (2020-08-09) 1 commit
306
+ - diff-lib: use worktree mode in diffs from i-t-a entries
307
+
308
+ "git diff [<tree-ish>] $path" for a $path that is marked with i-t-a
309
+ bit was not showing the mode bits from the working tree.
310
311
--------------------------------------------------
312
[Stalled]
313
314
+* pw/rebase-i-more-options (2020-07-16) 5 commits
315
+ - rebase: add --reset-author-date
316
+ - rebase -i: support --ignore-date
317
+ - sequencer: rename amend_author to author_to_free
318
+ - rebase -i: support --committer-date-is-author-date
319
+ - rebase -i: add --ignore-whitespace flag
320
+
321
+ "git rebase -i" learns a bit more options.
322
+
323
+ Waiting for a (hopefully final) review.
324
+
325
+
326
+* mt/grep-sparse-checkout (2020-06-12) 6 commits
327
+ - config: add setting to ignore sparsity patterns in some cmds
328
+ - grep: honor sparse checkout patterns
329
+ - config: correctly read worktree configs in submodules
330
+ - t/helper/test-config: facilitate addition of new cli options
331
+ - t/helper/test-config: return exit codes consistently
332
+ - doc: grep: unify info on configuration variables
333
+
334
+ "git grep" has been tweaked to be limited to the sparse checkout
335
+ paths.
336
+
337
+ Review needed on 4/6; otherwise looking sane.
338
+ cf. <CABPp-BGdEyEeajYZj_rdxp=MyEQdszuyjVTax=hhYj3fOtRQUQ@mail.gmail.com>
339
+
340
+
341
+* rs/more-buffered-io (2020-08-02) 3 commits
342
+ - upload-pack: use buffered I/O to talk to rev-list
343
+ - midx: use buffered I/O to talk to pack-objects
344
+ - connected: use buffered I/O to talk to rev-list
345
+
346
+ Expecting a reroll.
347
+
348
+
349
+* ls/mergetool-meld-auto-merge (2020-07-12) 2 commits
350
+ - SQUASH???
351
+ - Support auto-merge for meld to follow the vim-diff behavior
352
+
353
+ The 'meld' backend of the "git mergetool" learned to give the
354
+ underlying 'meld' the '--auto-merge' option, which would help
355
+ reduce the amount of text that requires manual merging.
356
+
357
+ Expecting a reroll.
358
+
359
+
360
* jx/proc-receive-hook (2020-05-18) 11 commits
361
. doc: add documentation for the proc-receive hook
362
. transport: parse report options for tracking refs
@@ -264,6 +434,19 @@ repositories listed at
434
--------------------------------------------------
435
[Cooking]
436
437
+* es/worktree-doc-cleanups (2020-08-03) 5 commits
438
+ (merged to 'next' on 2020-08-04 at cbb53ca464)
439
+ + git-worktree.txt: link to man pages when citing other Git commands
440
+ + git-worktree.txt: make start of new sentence more obvious
441
+ + git-worktree.txt: fix minor grammatical issues
442
+ + git-worktree.txt: consistently use term "working tree"
443
+ + git-worktree.txt: employ fixed-width typeface consistently
444
+
445
+ Doc cleanup around "worktree".
446
+
447
+ Will merge to 'master'.
448
+
449
+
450
* jk/log-fp-implies-m (2020-07-29) 7 commits
451
(merged to 'next' on 2020-08-03 at 39fefa6b82)
452
+ doc/git-log: clarify handling of merge commit diffs
@@ -281,33 +464,8 @@ repositories listed at
464
been made to imply "-m". Use "--no-diff-merges" to restore the
465
previous behaviour to omit patches for merge commits.
466
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'.
467
+ On hold a bit.
468
+ cf. <20200804200018.GB2014743@coredump.intra.peff.net>
469
470
471
* pd/mergetool-nvimdiff (2020-07-29) 2 commits
@@ -317,15 +475,21 @@ repositories listed at
475
The existing backends for "git mergetool" based on variants of vim
476
have been refactored and then support for "nvim" has been added.
477
478
+ Will merge to 'next'.
479
321
-* al/bisect-first-parent (2020-07-29) 3 commits
480
+
481
+* al/bisect-first-parent (2020-08-07) 5 commits
482
- bisect: combine args passed to find_bisection()
483
- bisect: introduce first-parent flag
484
+ - cmd_bisect__helper: defer parsing no-checkout flag
485
- rev-list: allow bisect and first-parent flags
486
+ - t6030: modernize "git bisect run" tests
487
488
"git bisect" learns the "--first-parent" option to find the first
489
breakage along the first-parent chain.
490
491
+ Will merge to 'next'.
492
+
493
494
* dd/send-email-config (2020-07-23) 1 commit
495
- git-send-email: die if sendmail.* config is set
@@ -333,94 +497,54 @@ repositories listed at
497
Stop when "sendmail.*" configuration variables are defined, which
498
could be a mistaken attempt to define "sendemail.*" variables.
499
336
-
337
-* jt/pack-objects-prefetch-in-batch (2020-07-21) 2 commits
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
346
- one may be inefficient---the code now attempts to fetch all the
347
- missing objects in batch (obviously this won't work for a lazy
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
-
351
- Will merge to 'master'.
352
-
353
-
354
-* jt/pretend-object-never-come-from-elsewhere (2020-07-21) 1 commit
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
-
365
- Will merge to 'master'.
500
+ Will merge to 'next'.
501
502
503
* bc/sha-256-part-3 (2020-07-30) 39 commits
369
- - t: remove test_oid_init in tests
370
- - docs: add documentation for extensions.objectFormat
371
- - ci: run tests with SHA-256
372
- - t: make SHA1 prerequisite depend on default hash
373
- - t: allow testing different hash algorithms via environment
374
- - t: add test_oid option to select hash algorithm
375
- - repository: enable SHA-256 support by default
376
- - setup: add support for reading extensions.objectformat
377
- - bundle: add new version for use with SHA-256
378
- - builtin/verify-pack: implement an --object-format option
379
- - http-fetch: set up git directory before parsing pack hashes
380
- - t0410: mark test with SHA1 prerequisite
381
- - t5308: make test work with SHA-256
382
- - t9700: make hash size independent
383
- - t9500: ensure that algorithm info is preserved in config
384
- - t9350: make hash size independent
385
- - t9301: make hash size independent
386
- - t9300: use $ZERO_OID instead of hard-coded object ID
387
- - t9300: abstract away SHA-1-specific constants
388
- - t8011: make hash size independent
389
- - t8003: make hash size independent
390
- - t8002: make hash size independent
391
- - t7508: use $ZERO_OID instead of hard-coded constant
392
- - t7506: avoid checking for SHA-1-specific constants
393
- - t7405: make hash size independent
394
- - t7400: make hash size independent
395
- - t7102: abstract away SHA-1-specific constants
396
- - t7201: abstract away SHA-1-specific constants
397
- - t7063: make hash size independent
398
- - t7003: compute appropriate length constant
399
- - t6501: avoid hard-coded objects
400
- - t6500: specify test values for SHA-256
401
- - t6301: make hash size independent
402
- - t6101: make hash size independent
403
- - t6100: make hash size independent
404
- - t3404: prepare 'short SHA-1 collision' tests for SHA-256
405
- - t3305: make hash agnostic
406
- - t1001: use $ZERO_OID
407
- - t: make test-bloom initialize repository
504
+ (merged to 'next' on 2020-08-04 at 57115e548f)
505
+ + t: remove test_oid_init in tests
506
+ + docs: add documentation for extensions.objectFormat
507
+ + ci: run tests with SHA-256
508
+ + t: make SHA1 prerequisite depend on default hash
509
+ + t: allow testing different hash algorithms via environment
510
+ + t: add test_oid option to select hash algorithm
511
+ + repository: enable SHA-256 support by default
512
+ + setup: add support for reading extensions.objectformat
513
+ + bundle: add new version for use with SHA-256
514
+ + builtin/verify-pack: implement an --object-format option
515
+ + http-fetch: set up git directory before parsing pack hashes
516
+ + t0410: mark test with SHA1 prerequisite
517
+ + t5308: make test work with SHA-256
518
+ + t9700: make hash size independent
519
+ + t9500: ensure that algorithm info is preserved in config
520
+ + t9350: make hash size independent
521
+ + t9301: make hash size independent
522
+ + t9300: use $ZERO_OID instead of hard-coded object ID
523
+ + t9300: abstract away SHA-1-specific constants
524
+ + t8011: make hash size independent
525
+ + t8003: make hash size independent
526
+ + t8002: make hash size independent
527
+ + t7508: use $ZERO_OID instead of hard-coded constant
528
+ + t7506: avoid checking for SHA-1-specific constants
529
+ + t7405: make hash size independent
530
+ + t7400: make hash size independent
531
+ + t7102: abstract away SHA-1-specific constants
532
+ + t7201: abstract away SHA-1-specific constants
533
+ + t7063: make hash size independent
534
+ + t7003: compute appropriate length constant
535
+ + t6501: avoid hard-coded objects
536
+ + t6500: specify test values for SHA-256
537
+ + t6301: make hash size independent
538
+ + t6101: make hash size independent
539
+ + t6100: make hash size independent
540
+ + t3404: prepare 'short SHA-1 collision' tests for SHA-256
541
+ + t3305: make hash agnostic
542
+ + t1001: use $ZERO_OID
543
+ + t: make test-bloom initialize repository
544
545
The final leg of SHA-256 transition.
546
411
- Will merge to 'next'.
412
-
413
-
414
-* mp/complete-show-color-moved (2020-07-15) 1 commit
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
-
547
Will merge to 'master'.
423
- A follow-up patch to reduce duplication may be warranted.
548
549
550
* hn/reftable-prep-part-2 (2020-07-27) 3 commits
@@ -430,21 +554,14 @@ repositories listed at
554
555
Further preliminary change to refs API.
556
557
+ Will merge to 'next'.
558
+
559
434
-* ds/maintenance (2020-07-30) 20 commits
560
+* ds/maintenance (2020-08-06) 11 commits
561
- maintenance: add trace2 regions for task execution
436
- - midx: use start_delayed_progress()
437
- - maintenance: add incremental-repack auto condition
438
- - maintenance: create auto condition for loose-objects
562
- maintenance: add auto condition for commit-graph task
563
- maintenance: use pointers to check --auto
564
- 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
565
- maintenance: take a lock on the objects directory
566
- maintenance: add --task option
567
- maintenance: add commit-graph task
@@ -452,34 +569,27 @@ repositories listed at
569
- maintenance: replace run_auto_gc()
570
- maintenance: add --quiet option
571
- maintenance: create basic maintenance runner
455
- (this branch uses jk/strvec.)
572
+ (this branch is used by ds/maintenance-part-2.)
573
574
A "git gc"'s big brother has been introduced to take care of more
575
repository maintenance tasks, not limited to the object database
576
cleaning.
577
578
462
-* ls/mergetool-meld-auto-merge (2020-07-12) 2 commits
463
- - SQUASH???
464
- - Support auto-merge for meld to follow the vim-diff behavior
465
-
466
- The 'meld' backend of the "git mergetool" learned to give the
467
- underlying 'meld' the '--auto-merge' option, which would help
468
- reduce the amount of text that requires manual merging.
469
-
470
- Expecting a reroll.
471
-
472
-
473
-* tb/upload-pack-filters (2020-08-03) 3 commits
474
- - upload-pack.c: introduce 'uploadpackfilter.tree.maxDepth'
475
- - upload-pack.c: allow banning certain object filter(s)
476
- - list_objects_filter_options: introduce 'list_object_filter_config_name'
579
+* tb/upload-pack-filters (2020-08-05) 4 commits
580
+ (merged to 'next' on 2020-08-05 at 918e7092fe)
581
+ + t5616: use test_i18ngrep for upload-pack errors
582
+ (merged to 'next' on 2020-08-04 at 3ae57cc90c)
583
+ + upload-pack.c: introduce 'uploadpackfilter.tree.maxDepth'
584
+ + upload-pack.c: allow banning certain object filter(s)
585
+ + list_objects_filter_options: introduce 'list_object_filter_config_name'
586
587
The component to respond to "git fetch" request is made more
588
configurable to selectively allow or reject object filtering
589
specification used for partial cloning.
590
482
- Will merge to 'next'.
591
+ Will merge to 'master'.
592
+ cf. <20200804003722.GA2726931@coredump.intra.peff.net>
593
594
595
* mt/hash-to-hex-thread-safety (2020-06-26) 2 commits
@@ -510,7 +620,6 @@ repositories listed at
620
CMake support to build with MSVC for Windows bypassing the Makefile.
621
622
Will merge to 'master'.
513
- cf. https://github.com/git/git/runs/892824895
623
624
625
* es/config-hooks (2020-07-30) 6 commits
@@ -523,32 +632,11 @@ repositories listed at
632
633
The "hooks defined in config" topic.
634
526
-
527
-* pw/rebase-i-more-options (2020-07-16) 5 commits
528
- - rebase: add --reset-author-date
529
- - rebase -i: support --ignore-date
530
- - sequencer: rename amend_author to author_to_free
531
- - rebase -i: support --committer-date-is-author-date
532
- - rebase -i: add --ignore-whitespace flag
533
-
534
- "git rebase -i" learns a bit more options.
535
-
536
- Waiting for a (hopefully final) review.
537
-
538
-
539
-* mt/grep-sparse-checkout (2020-06-12) 6 commits
540
- - config: add setting to ignore sparsity patterns in some cmds
541
- - grep: honor sparse checkout patterns
542
- - config: correctly read worktree configs in submodules
543
- - t/helper/test-config: facilitate addition of new cli options
544
- - t/helper/test-config: return exit codes consistently
545
- - doc: grep: unify info on configuration variables
546
-
547
- "git grep" has been tweaked to be limited to the sparse checkout
548
- paths.
549
-
550
- Review needed on 4/6; otherwise looking sane.
551
- cf. <CABPp-BGdEyEeajYZj_rdxp=MyEQdszuyjVTax=hhYj3fOtRQUQ@mail.gmail.com>
635
+ Expecting a reroll.
636
+ Now jk/strvec is in 'master', we may want to see the topic reworked
637
+ on top of it. Are there unresolved issues, or does the topic need
638
+ a round of detailed review?
639
+ cf. <xmqqmu3i9kvg.fsf@gitster.c.googlers.com>
640
641
--------------------------------------------------
642
[Discarded]