What's cooking (2020/08 #03)
Junio C Hamano committed
Aug 13, 2020 at 15:01 UTC
58c26d9e21e9d4a3d96263c7f2ec7bcb5f9511ad
1 file changed
+395
-337
whats-cooking.txt
+395
-337
@@ -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, #02; Mon, 10)
4
-X-master-at: 4f0a8be78499454eac3985b6e7e144b8376ab0a5
5
-X-next-at: 1739fa56f16d224373590068a68d990fb82ab9d0
3
+Subject: What's cooking in git.git (Aug 2020, #03; Thu, 13)
4
+X-master-at: 878e727637ec5815ccb3301eb994a54df95b21b8
5
+X-next-at: 1956fa8f8d7168157346f0cbc0f1f9dd1fca787a
6
7
-What's cooking in git.git (Aug 2020, #02; Mon, 10)
7
+What's cooking in git.git (Aug 2020, #03; Thu, 13)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,6 +12,13 @@ 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
+We are at 7th batch. I'm trying to merge smaller batches of topics
16
+to the 'master' branch more often than the previous cycles. I will
17
+also experiment, for smaller topics, with shorter gestation period
18
+in 'next' before merging them to the 'master' branch. We'll see if
19
+this lowers stability of the tip of 'master' significantly; not that
20
+much, hopefully.
21
+
22
You can find the changes described here in the integration branches of the
23
repositories listed at
24
@@ -20,293 +27,334 @@ repositories listed at
27
--------------------------------------------------
28
[Graduated to 'master']
29
23
-* en/eol-attrs-gotchas (2020-08-03) 4 commits
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
30
+* bc/sha-256-cvs-svn-updates (2020-08-05) 1 commit
31
+ (merged to 'next' on 2020-08-07 at b1ce7e5ec5)
32
+ + git-cvsexportcommit: support Perl before 5.10.1
33
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.
34
+ Portability fix.
35
36
35
-* en/merge-recursive-comment-fixes (2020-08-02) 1 commit
36
- (merged to 'next' on 2020-08-04 at ec14b8ea94)
37
- + merge-recursive: fix unclear and outright wrong comments
37
+* bc/sha-256-part-3 (2020-07-30) 39 commits
38
+ (merged to 'next' on 2020-08-04 at 57115e548f)
39
+ + t: remove test_oid_init in tests
40
+ + docs: add documentation for extensions.objectFormat
41
+ + ci: run tests with SHA-256
42
+ + t: make SHA1 prerequisite depend on default hash
43
+ + t: allow testing different hash algorithms via environment
44
+ + t: add test_oid option to select hash algorithm
45
+ + repository: enable SHA-256 support by default
46
+ + setup: add support for reading extensions.objectformat
47
+ + bundle: add new version for use with SHA-256
48
+ + builtin/verify-pack: implement an --object-format option
49
+ + http-fetch: set up git directory before parsing pack hashes
50
+ + t0410: mark test with SHA1 prerequisite
51
+ + t5308: make test work with SHA-256
52
+ + t9700: make hash size independent
53
+ + t9500: ensure that algorithm info is preserved in config
54
+ + t9350: make hash size independent
55
+ + t9301: make hash size independent
56
+ + t9300: use $ZERO_OID instead of hard-coded object ID
57
+ + t9300: abstract away SHA-1-specific constants
58
+ + t8011: make hash size independent
59
+ + t8003: make hash size independent
60
+ + t8002: make hash size independent
61
+ + t7508: use $ZERO_OID instead of hard-coded constant
62
+ + t7506: avoid checking for SHA-1-specific constants
63
+ + t7405: make hash size independent
64
+ + t7400: make hash size independent
65
+ + t7102: abstract away SHA-1-specific constants
66
+ + t7201: abstract away SHA-1-specific constants
67
+ + t7063: make hash size independent
68
+ + t7003: compute appropriate length constant
69
+ + t6501: avoid hard-coded objects
70
+ + t6500: specify test values for SHA-256
71
+ + t6301: make hash size independent
72
+ + t6101: make hash size independent
73
+ + t6100: make hash size independent
74
+ + t3404: prepare 'short SHA-1 collision' tests for SHA-256
75
+ + t3305: make hash agnostic
76
+ + t1001: use $ZERO_OID
77
+ + t: make test-bloom initialize repository
78
39
- Comment fix.
79
+ The final leg of SHA-256 transition.
80
81
42
-* es/adjust-subtree-test-for-merge-msg-update (2020-08-03) 1 commit
43
- (merged to 'next' on 2020-08-04 at 634b1fcbac)
44
- + Revert "contrib: subtree: adjust test to change in fmt-merge-msg"
82
+* es/worktree-doc-cleanups (2020-08-03) 5 commits
83
+ (merged to 'next' on 2020-08-04 at cbb53ca464)
84
+ + git-worktree.txt: link to man pages when citing other Git commands
85
+ + git-worktree.txt: make start of new sentence more obvious
86
+ + git-worktree.txt: fix minor grammatical issues
87
+ + git-worktree.txt: consistently use term "working tree"
88
+ + git-worktree.txt: employ fixed-width typeface consistently
89
46
- Adjust tests in contrib/ to the recent change to fmt-merge-msg.
90
+ Doc cleanup around "worktree".
91
92
49
-* es/worktree-cleanup (2020-07-31) 4 commits
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()
93
+* jt/has_object (2020-08-06) 4 commits
94
+ (merged to 'next' on 2020-08-07 at ed08abb693)
95
+ + fsck: do not lazy fetch known non-promisor object
96
+ + pack-objects: no fetch when allow-{any,promisor}
97
+ + apply: do not lazy fetch when applying binary
98
+ + sha1-file: introduce no-lazy-fetch has_object()
99
56
- Code cleanup around "worktree" API implementation.
100
+ A new helper function has_object() has been introduced to make it
101
+ easier to mark object existence checks that do and don't want to
102
+ trigger lazy fetches, and a few such checks are converted using it.
103
104
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
105
+* ma/test-quote-cleanup (2020-08-06) 2 commits
106
+ (merged to 'next' on 2020-08-10 at 63a95c2926)
107
+ + t4104: modernize and simplify quoting
108
+ + t: don't spuriously close and reopen quotes
109
65
- Small fixes and workarounds.
110
+ Test cleanup.
111
112
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.)
113
+* rp/blame-first-parent-doc (2020-08-06) 1 commit
114
+ (merged to 'next' on 2020-08-10 at 3fdbebe1ea)
115
+ + blame-options.txt: document --first-parent option
116
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.
117
+ The "git blame --first-parent" option was not documented, but now
118
+ it is.
119
120
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
121
+* ss/cmake-build (2020-06-26) 8 commits
122
+ (merged to 'next' on 2020-08-03 at a0d70165c1)
123
+ + ci: modification of main.yml to use cmake for vs-build job
124
+ + cmake: support for building git on windows with msvc and clang.
125
+ + cmake: support for building git on windows with mingw
126
+ + cmake: support for testing git when building out of the source tree
127
+ + cmake: support for testing git with ctest
128
+ + cmake: installation support for git
129
+ + cmake: generate the shell/perl/python scripts and templates, translations
130
+ + Introduce CMake support for configuring Git
131
132
Originally merged to 'next' on 2020-08-01
133
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
134
+ CMake support to build with MSVC for Windows bypassing the Makefile.
135
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.
136
137
+* tb/upload-pack-filters (2020-08-05) 4 commits
138
+ (merged to 'next' on 2020-08-05 at 918e7092fe)
139
+ + t5616: use test_i18ngrep for upload-pack errors
140
+ (merged to 'next' on 2020-08-04 at 3ae57cc90c)
141
+ + upload-pack.c: introduce 'uploadpackfilter.tree.maxDepth'
142
+ + upload-pack.c: allow banning certain object filter(s)
143
+ + list_objects_filter_options: introduce 'list_object_filter_config_name'
144
116
-* ma/t1450-quotefix (2020-08-01) 1 commit
117
- (merged to 'next' on 2020-08-04 at 0e762e3553)
118
- + t1450: fix quoting of NUL byte when corrupting pack
145
+ The component to respond to "git fetch" request is made more
146
+ configurable to selectively allow or reject object filtering
147
+ specification used for partial cloning.
148
+ cf. <20200804003722.GA2726931@coredump.intra.peff.net>
149
120
- Test fix.
150
+--------------------------------------------------
151
+[New Topics]
152
153
+* en/merge-tests (2020-08-10) 11 commits
154
+ (merged to 'next' on 2020-08-13 at eab952350b)
155
+ + t6425: be more flexible with rename/delete conflict messages
156
+ + t642[23]: be more flexible for add/add conflicts involving pair renames
157
+ + t6422, t6426: be more flexible for add/add conflicts involving renames
158
+ + t6423: add an explanation about why one of the tests does not pass
159
+ + t6416, t6423: clarify some comments and fix some typos
160
+ + t6422: fix multiple errors with the mod6 test expectations
161
+ + t6423: fix test setup for a couple tests
162
+ + t6416, t6422: fix incorrect untracked file count
163
+ + t6422: fix bad check against missing file
164
+ + t6418: tighten delete/normalize conflict testcase
165
+ + Collect merge-related tests to t64xx
166
+
167
+ Updates to "git merge" tests, in preparation for a new merge
168
+ strategy backend.
169
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]
170
+ Will merge to 'master'.
171
127
- Originally merged to 'next' on 2020-08-01
172
129
- Command line completion (in contrib/) update.
130
- A follow-up patch to reduce duplication may be warranted.
173
+* ma/stop-progress-null-fix (2020-08-10) 1 commit
174
+ (merged to 'next' on 2020-08-13 at 8bdec5209f)
175
+ + progress: don't dereference before checking for NULL
176
177
+ NULL dereference fix.
178
133
-* ny/notes-doc-sample-update (2020-08-03) 1 commit
134
- (merged to 'next' on 2020-08-04 at a63dcb2c55)
135
- + docs: improve the example that illustrates git-notes path names
179
+ Will merge to 'master'.
180
137
- Doc updates.
181
182
+* ds/midx-repack-to-batch-size (2020-08-11) 1 commit
183
+ - multi-pack-index: repack batches below --batch-size
184
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'
185
+ The "--batch-size" option of "git multi-pack-index repack" command
186
+ is now used to specify that very small packfiles are collected into
187
+ one until the total size roughly exceeds it.
188
147
- Update "git help guides" documentation organization.
189
+ Will merge to 'next'.
190
191
150
-* rs/bisect-oid-to-hex-fix (2020-08-02) 1 commit
151
- (merged to 'next' on 2020-08-04 at dc3c8ea699)
152
- + bisect: use oid_to_hex_r() instead of memcpy()+oid_to_hex()
192
+* rs/upload-pack-sigchain-fix (2020-08-11) 1 commit
193
+ - upload-pack: remove superfluous sigchain_pop() call
194
154
- Code cleanup.
195
+ Code clean-up.
196
197
+ Will merge to 'next'.
198
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="
199
161
- Error message fix.
200
+* so/log-diff-merges-opt (2020-08-11) 3 commits
201
+ (merged to 'next' on 2020-08-11 at 99e070bdca)
202
+ + t/t4013: add test for --diff-merges=off
203
+ + doc/git-log: describe --diff-merges=off
204
+ + revision: change "--diff-merges" option to require parameter
205
+ (this branch uses jk/log-fp-implies-m.)
206
+
207
+ Earlier, to countermand the implicit "-m" option when the
208
+ "--first-parent" option is used with "git log", we added the
209
+ "--[no-]diff-merges" option in the jk/log-fp-implies-m topic. To
210
+ leave the door open to allow the "--diff-merges" option to take
211
+ values that instructs how patches for merge commits should be
212
+ computed (e.g. "cc"? "-p against first parent?"), redefine
213
+ "--diff-merges" to take non-optional value, and implement "off"
214
+ that means the same thing as "--no-diff-merges".
215
+
216
+ Will merge to 'master' together with 'jk/lo-implies-m'.
217
+
218
+
219
+* tb/bloom-improvements (2020-08-11) 14 commits
220
+ - builtin/commit-graph.c: introduce '--max-new-filters=<n>'
221
+ - commit-graph: rename 'split_commit_graph_opts'
222
+ - commit-graph: add large-filters bitmap chunk
223
+ - commit-graph.c: sort index into commits list
224
+ - bloom/diff: properly short-circuit on max_changes
225
+ - bloom: use provided 'struct bloom_filter_settings'
226
+ - csum-file.h: introduce 'hashwrite_be64()'
227
+ - bloom: split 'get_bloom_filter()' in two
228
+ - commit-graph.c: store maximum changed paths
229
+ - commit-graph: respect 'commitGraph.readChangedPaths'
230
+ - t/helper/test-read-graph.c: prepare repo settings
231
+ - commit-graph: pass a 'struct repository *' in more places
232
+ - t4216: use an '&&'-chain
233
+ - commit-graph: introduce 'get_bloom_filter_settings()'
234
+
235
+ Misc Bloom filter improvements.
236
163
---------------------------------------------------
164
-[New Topics]
237
+ Expecting a reroll.
238
+ It seems that the review is getting closer to result in another update.
239
+ cf. <20200811220503.GC66656@syl.lan>
240
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
241
170
- Portability fix.
242
+* ak/sequencer-fix-find-uniq-abbrev (2020-08-13) 1 commit
243
+ - rebase -i: fix possibly wrong onto hash in todo
244
172
- Will merge to 'master'.
245
+ Ring buffer with size 4 used for bin-hex translation resulted in a
246
+ wrong object name in the sequencer's todo output, which has been
247
+ corrected.
248
249
+ Will merge to 'next'.
250
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.)
251
252
+* en/dir-nonbare-embedded (2020-08-12) 2 commits
253
+ - dir: avoid prematurely marking nonbare repositories as matches
254
+ - t3000: fix some test description typos
255
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()
256
+ "ls-files -o" mishandled the top-level directory of another git
257
+ working tree that hangs in the current git working tree.
258
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.
259
+ Will merge to 'next'.
260
199
- Will merge to 'master'.
261
262
+* en/sequencer-merge-labels (2020-08-12) 1 commit
263
+ - sequencer: avoid garbled merge machinery messages due to commit labels
264
202
-* ma/doc-sha-256-is-experimental (2020-08-06) 1 commit
203
- - Documentation: mark `--object-format=sha256` as experimental
265
+ The commit labels used to explain each side of conflicted hunks
266
+ placed by the sequencer machinery have been made more readable by
267
+ humans.
268
205
- The recent addition of SHA-256 support is marked as experimental in
206
- the documentation.
269
+ Will merge to 'next'.
270
271
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
272
+* jb/commit-graph-doc-fix (2020-08-13) 1 commit
273
+ - docs: commit-graph: fix some whitespace in the diagram
274
214
- Test cleanup.
275
+ Docfix.
276
216
- Will merge to 'master'.
277
+ Will merge to 'next'.
278
279
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
280
+* jk/blame-coalesce-fix (2020-08-13) 3 commits
281
+ - blame: only coalesce lines that are adjacent in result
282
+ - t8003: factor setup out of coalesce test
283
+ - t8003: check output of coalesced blame
284
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.
285
+ When given more than one target line ranges, "git blame -La,b
286
+ -Lc,d" was over-eager to coalesce groups of original lines and
287
+ showed incorrect results, which has been corrected.
288
289
Will merge to 'next'.
290
291
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
292
+* jk/slimmed-down (2020-08-13) 5 commits
293
+ - drop vcs-svn experiment
294
+ - make git-fast-import a builtin
295
+ - make git-bugreport a builtin
296
+ - make credential helpers builtins
297
+ - Makefile: drop builtins from MSVC pdb list
298
237
- The "git blame --first-parent" option was not documented, but now
238
- it is.
299
+ Trim an unused binary and turn a bunch of commands into built-in.
300
240
- Will merge to 'master'.
301
+ In general this is a good thing to do, modulo 'bugreport'.
302
303
243
-* jc/noop-withstatic-inline (2020-08-06) 1 commit
244
- - compat-util: type-check parameters of no-op replacement functions
304
+* jk/unleak-fixes (2020-08-13) 2 commits
305
+ - ls-remote: simplify UNLEAK() usage
306
+ - stop calling UNLEAK() before die()
307
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.
308
+ Fix some incorrect UNLEAK() annotations.
309
251
-
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.
310
+ Will merge to 'next'.
311
312
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
313
+* pb/set-url-docfix (2020-08-13) 1 commit
314
+ - fetch, pull doc: correct description of '--set-upstream'
315
273
- Yet another subcommand of "git submodule" is getting rewritten in C.
316
+ Doc fix.
317
318
+ Will merge to 'next'.
319
276
-* am/ci-wsfix (2020-08-10) 1 commit
277
- - ci: fix inconsistent indentation
320
321
+* pb/userdiff-fortran-update (2020-08-13) 2 commits
322
+ - userdiff: improve Fortran xfuncname regex
323
+ - userdiff: add tests for Fortran xfuncname regex
324
280
-* es/init-no-separate-git-dir-in-bare (2020-08-10) 1 commit
281
- - init: disallow --separate-git-dir with bare repository
325
+ The regexp to identify the function boundary for FORTRAN programs
326
+ has been updated.
327
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.
328
+ Will merge to 'next'.
329
330
289
-* es/test-cmp-typocatcher (2020-08-09) 1 commit
290
- - test_cmp: diagnose incorrect arguments
331
+* rs/fast-export-anon-simplify (2020-08-13) 1 commit
332
+ - fast-export: factor out print_oid()
333
292
- Test framework update.
334
+ Code simplification.
335
336
Will merge to 'next'.
337
338
297
-* jk/sideband-error-l10n (2020-08-07) 1 commit
298
- - sideband: mark "remote error:" prefix for translation
339
+* rs/preserve-merges-unused-code-removal (2020-08-12) 1 commit
340
+ - rebase: remove unused function reschedule_last_action
341
300
- Mark error message for i18n.
342
+ Code clean-up.
343
344
Will merge to 'next'.
345
346
305
-* rp/ita-diff-modefix (2020-08-09) 1 commit
306
- - diff-lib: use worktree mode in diffs from i-t-a entries
347
+* ss/t7401-modernize (2020-08-12) 4 commits
348
+ - t7401: add a NEEDSWORK
349
+ - t7401: change indentation for enhanced readability
350
+ - t7401: change test_i18ncmp syntax for clarity
351
+ - t7401: modernize style
352
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.
353
+ Test clean-up.
354
+
355
+ Expecting a reroll.
356
+ cf. <c70f7bb5d1289f5318da7b99e41cf5828a451174.camel@gmail.com>
357
+ Almost there, it seems.
358
359
--------------------------------------------------
360
[Stalled]
@@ -434,17 +482,137 @@ repositories listed at
482
--------------------------------------------------
483
[Cooking]
484
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
485
+* ds/maintenance-part-2 (2020-08-06) 9 commits
486
+ - maintenance: add incremental-repack auto condition
487
+ - maintenance: auto-size incremental-repack batch
488
+ - maintenance: add incremental-repack task
489
+ - midx: use start_delayed_progress()
490
+ - midx: enable core.multiPackIndex by default
491
+ - maintenance: create auto condition for loose-objects
492
+ - maintenance: add loose-objects task
493
+ - maintenance: add prefetch task
494
+ - fetch: optionally allow disabling FETCH_HEAD update
495
+ (this branch uses ds/maintenance.)
496
445
- Doc cleanup around "worktree".
497
+ "git maintenance", an extended big brother of "git gc", continues
498
+ to evolve.
499
+
500
+ Under review.
501
+ A "review club" reviews have been posted for an early few steps.
502
+
503
+
504
+* ma/doc-sha-256-is-experimental (2020-08-06) 1 commit
505
+ - Documentation: mark `--object-format=sha256` as experimental
506
+
507
+ The recent addition of SHA-256 support is marked as experimental in
508
+ the documentation.
509
+
510
+ Will merge to 'next'.
511
+ cf. <xmqqmu2y1e0t.fsf@gitster.c.googlers.com>
512
+
513
+
514
+* rp/apply-cached-with-i-t-a (2020-08-09) 3 commits
515
+ (merged to 'next' on 2020-08-11 at c28eaa6a0e)
516
+ + t4140: test apply with i-t-a paths
517
+ + apply: make i-t-a entries never match worktree
518
+ + apply: allow "new file" patches on i-t-a entries
519
+
520
+ Recent versions of "git diff-files" shows a diff between the index
521
+ and the working tree for "intent-to-add" paths as a "new file"
522
+ patch; "git apply --cached" should be able to take "git diff-files"
523
+ and should act as an equivalent to "git add" for the path, but the
524
+ command failed to do so for such a path.
525
+
526
+ Will merge to 'master'.
527
+
528
+
529
+* jc/noop-with-static-inline (2020-08-06) 1 commit
530
+ (merged to 'next' on 2020-08-11 at 8a63ff648e)
531
+ + compat-util: type-check parameters of no-op replacement functions
532
+
533
+ A no-op replacement function implemented as a C preprocessor macro
534
+ does not perform as good a job as one implemented as a "static
535
+ inline" function in catching errors in parameters; replace the
536
+ former with the latter in <git-compat-util.h> header.
537
+
538
+ Will merge to 'master'.
539
+
540
+
541
+* ps/ref-transaction-hook (2020-08-11) 2 commits
542
+ (merged to 'next' on 2020-08-11 at 311c045810)
543
+ + t1416: avoid hard-coded sha1 ids
544
+ (merged to 'next' on 2020-08-10 at d8ad7cc8f6)
545
+ + refs: fix interleaving hook calls with reference-transaction hook
546
+
547
+ The logic to find the ref transaction hook script attempted to
548
+ cache the path to the found hook without realizing that it needed
549
+ to keep a copied value, as the API it used returned a transitory
550
+ buffer space. This has been corrected.
551
552
Will merge to 'master'.
553
+ to be followed by a removal of the caching feature, which does not
554
+ seem to help even as a negative cache.
555
+
556
+
557
+* ss/submodule-summary-in-c (2020-08-12) 4 commits
558
+ - submodule: port submodule subcommand 'summary' from shell to C
559
+ - t7421: introduce a test script for verifying 'summary' output
560
+ - submodule: rename helper functions to avoid ambiguity
561
+ - submodule: remove extra line feeds between callback struct and macro
562
+
563
+ Yet another subcommand of "git submodule" is getting rewritten in C.
564
+
565
+ Will merge to 'next'.
566
+
567
+
568
+* am/ci-wsfix (2020-08-10) 1 commit
569
+ - ci: fix inconsistent indentation
570
+
571
+ Aesthetic fix to a CI configuration file.
572
+
573
+ Waiting for a reroll.
574
+ It needs a better log message.
575
+
576
+
577
+* es/init-no-separate-git-dir-in-bare (2020-08-10) 1 commit
578
+ - init: disallow --separate-git-dir with bare repository
579
+
580
+ The purpose of "git init --separate-git-dir" is to initialize a
581
+ new project with the repository separate from the working tree,
582
+ or, in the case of an existing project, to move the repository
583
+ (the .git/ directory) out of the working tree. It does not make
584
+ sense to use --separate-git-dir with a bare repository for which
585
+ there is no working tree, so disallow its use with bare
586
+ repositories.
587
+
588
+ Will merge to 'next'.
589
+
590
+
591
+* es/test-cmp-typocatcher (2020-08-09) 1 commit
592
+ (merged to 'next' on 2020-08-11 at ee5557b170)
593
+ + test_cmp: diagnose incorrect arguments
594
+
595
+ Test framework update.
596
+
597
+ Will merge to 'master'.
598
+
599
+
600
+* jk/sideband-error-l10n (2020-08-07) 1 commit
601
+ (merged to 'next' on 2020-08-11 at 27dbe05a65)
602
+ + sideband: mark "remote error:" prefix for translation
603
+
604
+ Mark error message for i18n.
605
+
606
+ Will merge to 'master'.
607
+
608
+
609
+* rp/ita-diff-modefix (2020-08-09) 1 commit
610
+ - diff-lib: use worktree mode in diffs from i-t-a entries
611
+
612
+ "git diff [<tree-ish>] $path" for a $path that is marked with i-t-a
613
+ bit was not showing the mode bits from the working tree.
614
+
615
+ Will merge to 'next'.
616
617
618
* jk/log-fp-implies-m (2020-07-29) 7 commits
@@ -456,6 +624,7 @@ repositories listed at
624
+ log: enable "-m" automatically with "--first-parent"
625
+ revision: add "--no-diff-merges" option to counteract "-m"
626
+ log: drop "--cc implies -m" logic
627
+ (this branch is used by so/log-diff-merges-opt.)
628
629
Originally merged to 'next' on 2020-08-01
630
@@ -464,97 +633,53 @@ repositories listed at
633
been made to imply "-m". Use "--no-diff-merges" to restore the
634
previous behaviour to omit patches for merge commits.
635
467
- On hold a bit.
468
- cf. <20200804200018.GB2014743@coredump.intra.peff.net>
636
+ Will merge to 'master' together with 'so/log-diff-merges-opt'
637
638
639
* pd/mergetool-nvimdiff (2020-07-29) 2 commits
472
- - mergetools: add support for nvimdiff (neovim) family
473
- - mergetool--lib: improve support for vimdiff-style tool variants
640
+ (merged to 'next' on 2020-08-11 at 947ce686d0)
641
+ + mergetools: add support for nvimdiff (neovim) family
642
+ + mergetool--lib: improve support for vimdiff-style tool variants
643
644
The existing backends for "git mergetool" based on variants of vim
645
have been refactored and then support for "nvim" has been added.
646
478
- Will merge to 'next'.
647
+ Will merge to 'master'.
648
649
650
* 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
651
+ (merged to 'next' on 2020-08-11 at b232f7ca17)
652
+ + bisect: combine args passed to find_bisection()
653
+ + bisect: introduce first-parent flag
654
+ + cmd_bisect__helper: defer parsing no-checkout flag
655
+ + rev-list: allow bisect and first-parent flags
656
+ + t6030: modernize "git bisect run" tests
657
658
"git bisect" learns the "--first-parent" option to find the first
659
breakage along the first-parent chain.
660
491
- Will merge to 'next'.
661
+ Will merge to 'master'.
662
663
664
* dd/send-email-config (2020-07-23) 1 commit
495
- - git-send-email: die if sendmail.* config is set
665
+ (merged to 'next' on 2020-08-11 at aaf9f3a301)
666
+ + git-send-email: die if sendmail.* config is set
667
668
Stop when "sendmail.*" configuration variables are defined, which
669
could be a mistaken attempt to define "sendemail.*" variables.
670
500
- Will merge to 'next'.
501
-
502
-
503
-* bc/sha-256-part-3 (2020-07-30) 39 commits
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
-
671
Will merge to 'master'.
672
673
674
* hn/reftable-prep-part-2 (2020-07-27) 3 commits
551
- - Make HEAD a PSEUDOREF rather than PER_WORKTREE.
552
- - Modify pseudo refs through ref backend storage
553
- - t1400: use git rev-parse for testing PSEUDOREF existence
675
+ (merged to 'next' on 2020-08-11 at 43ac0bc60a)
676
+ + Make HEAD a PSEUDOREF rather than PER_WORKTREE.
677
+ + Modify pseudo refs through ref backend storage
678
+ + t1400: use git rev-parse for testing PSEUDOREF existence
679
680
Further preliminary change to refs API.
681
557
- Will merge to 'next'.
682
+ Will merge to 'master'.
683
684
685
* ds/maintenance (2020-08-06) 11 commits
@@ -576,22 +701,6 @@ repositories listed at
701
cleaning.
702
703
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
-
591
- Will merge to 'master'.
592
- cf. <20200804003722.GA2726931@coredump.intra.peff.net>
593
-
594
-
704
* mt/hash-to-hex-thread-safety (2020-06-26) 2 commits
705
- hex: make hash_to_hex_algop() and friends thread-safe
706
- compat/win32/pthread: add pthread_once()
@@ -604,24 +713,6 @@ repositories listed at
713
cf. <CAHd-oW6A2aBHg80R9kyifvF7thwzam5EYYoN9d2TaBcHJrcKWw@mail.gmail.com>
714
715
607
-* ss/cmake-build (2020-06-26) 8 commits
608
- (merged to 'next' on 2020-08-03 at a0d70165c1)
609
- + ci: modification of main.yml to use cmake for vs-build job
610
- + cmake: support for building git on windows with msvc and clang.
611
- + cmake: support for building git on windows with mingw
612
- + cmake: support for testing git when building out of the source tree
613
- + cmake: support for testing git with ctest
614
- + cmake: installation support for git
615
- + cmake: generate the shell/perl/python scripts and templates, translations
616
- + Introduce CMake support for configuring Git
617
-
618
- Originally merged to 'next' on 2020-08-01
619
-
620
- CMake support to build with MSVC for Windows bypassing the Makefile.
621
-
622
- Will merge to 'master'.
623
-
624
-
716
* es/config-hooks (2020-07-30) 6 commits
717
- hook: add 'run' subcommand
718
- parse-options: parse into argv_array
@@ -637,36 +728,3 @@ repositories listed at
728
on top of it. Are there unresolved issues, or does the topic need
729
a round of detailed review?
730
cf. <xmqqmu3i9kvg.fsf@gitster.c.googlers.com>
640
-
641
---------------------------------------------------
642
-[Discarded]
643
-
644
-* jk/fast-export-anonym (2020-06-22) 4 commits
645
- (merged to 'next' on 2020-06-22 at b517b2f707)
646
- + fast-export: allow dumping the path mapping
647
- + fast-export: refactor path printing to not rely on stdout
648
- + fast-export: anonymize "master" refname
649
- + fast-export: allow dumping the refname mapping
650
-
651
- The way refnames are anonymized has been updated and a way to help
652
- debugging using the anonymized output hsa been added.
653
-
654
- Superseded by 'jk/fast-export-anonym-alt'.
655
-
656
-
657
-* jk/t6000-timestamp-fix (2020-07-07) 1 commit
658
- (merged to 'next' on 2020-07-09 at 633bcd552f)
659
- + t6000: use test_tick consistently
660
-
661
- Test update.
662
-
663
- Now it is part of jk/tests-timestamp-fix with a larger scope.
664
-
665
-
666
-* jc/no-update-fetch-head (2020-07-29) 1 commit
667
- . fetch: optionally allow disabling FETCH_HEAD update
668
-
669
- "git fetch" learned the "--[no-]write-fetch-head" option to
670
- optionally stop describing what was fetched in FETCH_HEAD.
671
-
672
- Now it is part of ds/maintenance topic.