What's cooking (2019/07 #07)
Junio C Hamano committed
Jul 29, 2019 at 14:27 UTC
d9e7ea7b52975ef264a401ca8eccc98039e1fc1d
1 file changed
+113
-279
whats-cooking.txt
+113
-279
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jul 2019, #06; Thu, 25)
4
-X-master-at: 3034dab9ed6b11970a53099a7b3ca981f1461365
5
-X-next-at: 0f2c4a37fdba75d06ae7254c4b30ed7739985214
3
+Subject: What's cooking in git.git (Jul 2019, #07; Mon, 29)
4
+X-master-at: 026dd738a6e5f1e42ef0f390feacb5ed6acc4ee8
5
+X-next-at: 4dedae46a21fbd9d3232915177485ac88f42884f
6
7
-What's cooking in git.git (Jul 2019, #06; Thu, 25)
7
+What's cooking in git.git (Jul 2019, #07; Mon, 29)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,9 +12,7 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' 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
-The seventh batch is in; I've merged fix-up topics that has been in
16
-'master' for some time (i.e. up to the third batch of this cycle)
17
-down to 'maint'.
15
+The first preview for 2.23 has been tagged.
16
17
You can find the changes described here in the integration branches
18
of the repositories listed at
@@ -24,181 +22,6 @@ of the repositories listed at
22
--------------------------------------------------
23
[Graduated to "master"]
24
27
-* ab/test-env (2019-07-11) 9 commits
28
- (merged to 'next' on 2019-07-15 at 42e86beb20)
29
- + env--helper: mark a file-local symbol as static
30
- (merged to 'next' on 2019-07-09 at 096658f382)
31
- + tests: make GIT_TEST_FAIL_PREREQS a boolean
32
- + tests: replace test_tristate with "git env--helper"
33
- + tests README: re-flow a previously changed paragraph
34
- + tests: make GIT_TEST_GETTEXT_POISON a boolean
35
- + t6040 test: stop using global "script" variable
36
- + config.c: refactor die_bad_number() to not call gettext() early
37
- + env--helper: new undocumented builtin wrapping git_env_*()
38
- + config tests: simplify include cycle test
39
-
40
- Many GIT_TEST_* environment variables control various aspects of
41
- how our tests are run, but a few followed "non-empty is true, empty
42
- or unset is false" while others followed the usual "there are a few
43
- ways to spell true, like yes, on, etc., and also ways to spell
44
- false, like no, off, etc." convention.
45
-
46
-
47
-* ac/log-use-mailmap-by-default-transition (2019-07-15) 3 commits
48
- (merged to 'next' on 2019-07-19 at e5669de950)
49
- + tests: defang pager tests by explicitly disabling the log.mailmap warning
50
- + documentation: mention --no-use-mailmap and log.mailmap false setting
51
- + log: add warning for unspecified log.mailmap setting
52
-
53
- The "git log" command learns to issue a warning when log.mailmap
54
- configuration is not set and --[no-]mailmap option is not used, to
55
- prepare users for future versions of Git that uses the mailmap by
56
- default.
57
-
58
-
59
-* di/readme-markup-fix (2019-07-18) 1 commit
60
- (merged to 'next' on 2019-07-19 at 339470d824)
61
- + README: fix rendering of text in angle brackets
62
-
63
- Docfix.
64
-
65
-
66
-* es/local-atomic-push-failure-with-http (2019-07-16) 2 commits
67
- (merged to 'next' on 2019-07-19 at 8d5b776a96)
68
- + transport-helper: avoid var decl in for () loop control
69
- (merged to 'next' on 2019-07-15 at 960e92d24f)
70
- + transport-helper: enforce atomic in push_refs_with_push
71
-
72
- "git push --atomic" that goes over the transport-helper (namely,
73
- the smart http transport) failed to prevent refs to be pushed when
74
- it can locally tell that one of the ref update will fail without
75
- having to consult the other end, which has been corrected.
76
-
77
-
78
-* jc/denoise-rm-to-resolve (2019-07-18) 1 commit
79
- (merged to 'next' on 2019-07-19 at 12f7e5d413)
80
- + rm: resolving by removal is not a warning-worthy event
81
-
82
- "git rm" to resolve a conflicted path leaked an internal message
83
- "needs merge" before actually removing the path, which was
84
- confusing. This has been corrected.
85
-
86
-
87
-* jc/post-c89-rules-doc (2019-07-18) 1 commit
88
- (merged to 'next' on 2019-07-19 at 8acd58e189)
89
- + CodingGuidelines: spell out post-C89 rules
90
-
91
- We have been trying out a few language features outside c89; the
92
- coding guidelines document did not talk about them and instead had
93
- a blanket ban against them.
94
-
95
-
96
-* jk/test-commit-bulk (2019-07-23) 6 commits
97
- (merged to 'next' on 2019-07-23 at edc849c7dd)
98
- + t6200: use test_commit_bulk
99
- + t5703: use test_commit_bulk
100
- + t5702: use test_commit_bulk
101
- + t3311: use test_commit_bulk
102
- + t5310: increase the number of bitmapped commits
103
- + test-lib: introduce test_commit_bulk
104
-
105
- A test helper has been introduced to optimize preparation of test
106
- repositories with many simple commits, and a handful of test
107
- scripts have been updated to use it.
108
-
109
-
110
-* js/clean-report-too-long-a-path (2019-07-19) 1 commit
111
- (merged to 'next' on 2019-07-19 at b7da0a821c)
112
- + clean: show an error message when the path is too long
113
-
114
- "git clean" silently skipped a path when it cannot lstat() it; now
115
- it gives a warning.
116
-
117
-
118
-* js/mingw-spawn-with-spaces-in-path (2019-07-16) 1 commit
119
- (merged to 'next' on 2019-07-19 at 33dd6d0401)
120
- + mingw: support spawning programs containing spaces in their names
121
-
122
- Window 7 update ;-)
123
-
124
-
125
-* js/unmap-before-ext-diff (2019-07-11) 1 commit
126
- (merged to 'next' on 2019-07-15 at 7aa292c66c)
127
- + diff: munmap() file contents before running external diff
128
-
129
- Windows update.
130
-
131
-
132
-* mt/dir-iterator-updates (2019-07-11) 10 commits
133
- (merged to 'next' on 2019-07-19 at 2ebb586ce6)
134
- + clone: replace strcmp by fspathcmp
135
- + clone: use dir-iterator to avoid explicit dir traversal
136
- + clone: extract function from copy_or_link_directory
137
- + clone: copy hidden paths at local clone
138
- + dir-iterator: add flags parameter to dir_iterator_begin
139
- + dir-iterator: refactor state machine model
140
- + dir-iterator: use warning_errno when possible
141
- + dir-iterator: add tests for dir-iterator API
142
- + clone: better handle symlinked files at .git/objects/
143
- + clone: test for our behavior on odd objects/* content
144
-
145
- Adjust the dir-iterator API and apply it to the local clone
146
- optimization codepath.
147
-
148
-
149
-* rm/gpg-program-doc-fix (2019-07-12) 1 commit
150
- (merged to 'next' on 2019-07-15 at ef358ec2e9)
151
- + gpg(docs): use correct --verify syntax
152
-
153
- Docfix.
154
-
155
-
156
-* sr/gpg-interface-stop-at-the-end (2019-07-16) 1 commit
157
- (merged to 'next' on 2019-07-19 at 5d38aa1236)
158
- + gpg-interface: do not scan past the end of buffer
159
-
160
- A codepath that reads from GPG for signed object verification read
161
- past the end of allocated buffer, which has been fixed.
162
-
163
-
164
-* tg/range-diff-output-update (2019-07-11) 14 commits
165
- (merged to 'next' on 2019-07-15 at b847d206ed)
166
- + range-diff: add headers to the outer hunk header
167
- + range-diff: add filename to inner diff
168
- + range-diff: add section header instead of diff header
169
- + range-diff: suppress line count in outer diff
170
- + range-diff: don't remove funcname from inner diff
171
- + range-diff: split lines manually
172
- + range-diff: fix function parameter indentation
173
- + apply: make parse_git_diff_header public
174
- + apply: only pass required data to gitdiff_* functions
175
- + apply: only pass required data to find_name_*
176
- + apply: only pass required data to check_header_line
177
- + apply: only pass required data to git_header_name
178
- + apply: only pass required data to skip_tree_prefix
179
- + apply: replace marc.info link with public-inbox
180
-
181
- "git range-diff" output has been tweaked for easier identification
182
- of which part of what file the patch shown is about.
183
-
184
-
185
-* tg/stash-keep-index-with-removed-paths (2019-07-16) 1 commit
186
- (merged to 'next' on 2019-07-19 at d4ae24a939)
187
- + stash: fix handling removed files with --keep-index
188
-
189
- "git stash --keep-index" did not work correctly on paths that have
190
- been removed, which has been fixed.
191
-
192
-
193
-* vn/xmmap-gently (2019-07-14) 1 commit
194
- (merged to 'next' on 2019-07-19 at d95c1d2be3)
195
- + read-cache.c: do not die if mmap fails
196
-
197
- Clean-up an error codepath.
198
-
199
---------------------------------------------------
200
-[New Topics]
201
-
25
* bb/grep-pcre2-bug-message-fix (2019-07-23) 1 commit
26
(merged to 'next' on 2019-07-23 at 8bd5a68618)
27
+ grep: print the pcre2_jit_on value
@@ -208,38 +31,6 @@ of the repositories listed at
31
The codepath may want to just simply be removed, though.
32
33
211
-* ra/rebase-i-more-options (2019-07-23) 4 commits
212
- - SQUASH???
213
- - rebase -i: support --committer-date-is-author-date
214
- - sequencer: add NULL checks under read_author_script
215
- - rebase -i: add --ignore-whitespace flag
216
-
217
- "git rebase -i" learned a few options that are known by "git
218
- rebase" proper.
219
-
220
- Needs a bit of fixups, at least.
221
-
222
-
223
-* sg/travis-gcc-4.8 (2019-07-19) 1 commit
224
- (merged to 'next' on 2019-07-25 at e3d546eb15)
225
- + travis-ci: build with GCC 4.8 as well
226
-
227
- Add a job to build with a tad older GCC to make sure we are still
228
- buildable.
229
-
230
- Will merge to 'master'.
231
-
232
-
233
-* ab/pcre-jit-fixes (2019-07-24) 3 commits
234
- - grep: stop using a custom JIT stack with PCRE v1
235
- - grep: stop "using" a custom JIT stack with PCRE v2
236
- - grep: remove overly paranoid BUG(...) code
237
-
238
- A few simplification and bugfixes to PCRE interface.
239
-
240
- Will merge to 'next'.
241
-
242
-
34
* jk/xdiff-clamp-funcname-context-index (2019-07-23) 1 commit
35
(merged to 'next' on 2019-07-25 at b2944a0ba6)
36
+ xdiff: clamp function context indices in post-image
@@ -248,8 +39,6 @@ of the repositories listed at
39
looking for --funcion-context line in a corner case, which has been
40
corrected.
41
251
- Will merge to 'master'.
252
-
42
43
* js/rebase-cleanup (2019-07-25) 2 commits
44
(merged to 'next' on 2019-07-25 at 3d9cedf470)
@@ -258,58 +47,17 @@ of the repositories listed at
47
48
A few leftover cleanup to "git rebase" in C.
49
261
- Will merge to 'master'.
50
51
+* sg/travis-gcc-4.8 (2019-07-19) 1 commit
52
+ (merged to 'next' on 2019-07-25 at e3d546eb15)
53
+ + travis-ci: build with GCC 4.8 as well
54
264
-* js/rebase-r-strategy (2019-07-25) 12 commits
265
- - rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
266
- - t3418: test `rebase -r` with merge strategies
267
- - t/lib-rebase: prepare for testing `git rebase --rebase-merges`
268
- - rebase -r: support merge strategies other than `recursive`
269
- - t3427: mark two test cases as requiring support for `git rebase -p`
270
- - t3427: fix another incorrect assumption
271
- - t3427: accommodate for the `rebase --merge` backend having been replaced
272
- - t3427: fix erroneous assumption
273
- - t3427: condense the unnecessarily repetitive test cases into three
274
- - t3427: move the `filter-branch` invocation into the `setup` case
275
- - t3427: simplify the `setup` test case significantly
276
- - t3427: add a clarifying comment
277
-
278
- "git rebase --rebase-merges" learned to drive different merge
279
- strategies and pass strategy specific options to them.
280
-
281
-
282
-* js/trace2-json-schema (2019-07-25) 3 commits
283
- - ci: run trace2 schema validation in the CI suite
284
- - trace2: add a schema validator for trace2 events
285
- - trace2: add a JSON schema for trace2 events
286
-
287
- The JSON output produced by "trace2" subsystem now has JSON schema
288
- defined on it, to allow us validate the output and catch deviation.
289
-
290
- The CI integration may be a bit too heavy-handed.
55
+ Add a job to build with a tad older GCC to make sure we are still
56
+ buildable.
57
58
--------------------------------------------------
59
[Stalled]
60
295
-* cb/xdiff-no-system-includes-in-dot-c (2019-06-19) 1 commit
296
- - xdiff: avoid accidental redefinition of LFS feature in OpenIndiana
297
-
298
- Compilation fix.
299
-
300
- Will be rerolled together with patches from the
301
- jk/no-system-includes-in-dot-c topic.
302
-
303
-
304
-* jk/no-system-includes-in-dot-c (2019-06-19) 2 commits
305
- - wt-status.h: drop stdio.h include
306
- - verify-tag: drop signal.h include
307
-
308
- Compilation fix.
309
-
310
- Will be rerolled with the above.
311
-
312
-
61
* nd/index-dump-in-json (2019-06-26) 11 commits
62
- SQUASH???
63
- t3008: use the new SINGLE_CPU prereq
@@ -400,6 +148,78 @@ of the repositories listed at
148
--------------------------------------------------
149
[Cooking]
150
151
+* vn/reset-deleted-ita (2019-07-26) 1 commit
152
+ - reset: unstage empty deleted ita files
153
+
154
+ "git reset HEAD [<pathspec>]" did not reset an empty file that was
155
+ added with the intent-to-add bit.
156
+
157
+ Expecting a reroll.
158
+
159
+
160
+* cb/xdiff-no-system-includes-in-dot-c (2019-07-28) 3 commits
161
+ (merged to 'next' on 2019-07-29 at 35ea0d8cba)
162
+ + xdiff: remove duplicate headers from xpatience.c
163
+ + xdiff: remove duplicate headers from xhistogram.c
164
+ + xdiff: drop system includes in xutils.c
165
+ (this branch uses jk/no-system-includes-in-dot-c.)
166
+
167
+ Compilation fix.
168
+
169
+ Will merge to 'master'.
170
+
171
+
172
+* jk/no-system-includes-in-dot-c (2019-06-19) 2 commits
173
+ (merged to 'next' on 2019-07-29 at 8081b8c13d)
174
+ + wt-status.h: drop stdio.h include
175
+ + verify-tag: drop signal.h include
176
+ (this branch is used by cb/xdiff-no-system-includes-in-dot-c.)
177
+
178
+ Compilation fix.
179
+
180
+ Will merge to 'master'.
181
+
182
+* ra/rebase-i-more-options (2019-07-23) 4 commits
183
+ - SQUASH???
184
+ - rebase -i: support --committer-date-is-author-date
185
+ - sequencer: add NULL checks under read_author_script
186
+ - rebase -i: add --ignore-whitespace flag
187
+
188
+ "git rebase -i" learned a few options that are known by "git
189
+ rebase" proper.
190
+
191
+ Needs a bit of fixups, at least.
192
+
193
+
194
+* js/rebase-r-strategy (2019-07-25) 12 commits
195
+ - rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
196
+ - t3418: test `rebase -r` with merge strategies
197
+ - t/lib-rebase: prepare for testing `git rebase --rebase-merges`
198
+ - rebase -r: support merge strategies other than `recursive`
199
+ - t3427: mark two test cases as requiring support for `git rebase -p`
200
+ - t3427: fix another incorrect assumption
201
+ - t3427: accommodate for the `rebase --merge` backend having been replaced
202
+ - t3427: fix erroneous assumption
203
+ - t3427: condense the unnecessarily repetitive test cases into three
204
+ - t3427: move the `filter-branch` invocation into the `setup` case
205
+ - t3427: simplify the `setup` test case significantly
206
+ - t3427: add a clarifying comment
207
+
208
+ "git rebase --rebase-merges" learned to drive different merge
209
+ strategies and pass strategy specific options to them.
210
+
211
+
212
+* js/trace2-json-schema (2019-07-25) 3 commits
213
+ . ci: run trace2 schema validation in the CI suite
214
+ . trace2: add a schema validator for trace2 events
215
+ . trace2: add a JSON schema for trace2 events
216
+
217
+ The JSON output produced by "trace2" subsystem now has JSON schema
218
+ defined on it, to allow us validate the output and catch deviation.
219
+
220
+ The CI integration may be a bit too heavy-handed.
221
+
222
+
223
* js/builtin-add-i (2019-07-18) 11 commits
224
- built-in add -i: implement the `help` command
225
- built-in add -i: use color in the main loop
@@ -416,9 +236,8 @@ of the repositories listed at
236
The beginning of rewriting "git add -i" in C.
237
238
419
-* js/visual-studio (2019-07-18) 24 commits
239
+* js/visual-studio (2019-07-29) 23 commits
240
- git: avoid calling aliased builtins via their dashed form
421
- - t5505,t5516: create .git/branches/ when needed
241
- bin-wrappers: append `.exe` to target paths if necessary
242
- .gitignore: ignore Visual Studio's temporary/generated files
243
- .gitignore: touch up the entries regarding Visual Studio
@@ -444,25 +263,27 @@ of the repositories listed at
263
264
Support building Git with Visual Studio
265
447
- The ".git/branches" bit needs to be ejected and treated separately,
448
- but other than that, the topic looked reasonable.
266
+ The bits about .git/branches/* have been dropped from the series.
267
+ We may want to drop the support for it, but until that happens, the
268
+ tests should rely on the existence of the support to pass.
269
270
271
* bc/hash-independent-tests-part-4 (2019-07-01) 10 commits
452
- - t2203: avoid hard-coded object ID values
453
- - t1710: make hash independent
454
- - t1007: remove SHA1 prerequisites
455
- - t0090: make test pass with SHA-256
456
- - t0027: make hash size independent
457
- - t6030: make test work with SHA-256
458
- - t5000: make hash independent
459
- - t1450: make hash size independent
460
- - t1410: make hash size independent
461
- - t: add helper to convert object IDs to paths
272
+ (merged to 'next' on 2019-07-29 at d1efaea0ec)
273
+ + t2203: avoid hard-coded object ID values
274
+ + t1710: make hash independent
275
+ + t1007: remove SHA1 prerequisites
276
+ + t0090: make test pass with SHA-256
277
+ + t0027: make hash size independent
278
+ + t6030: make test work with SHA-256
279
+ + t5000: make hash independent
280
+ + t1450: make hash size independent
281
+ + t1410: make hash size independent
282
+ + t: add helper to convert object IDs to paths
283
284
Update to the tests to help SHA-256 transition continues.
285
465
- Will merge to 'next'.
286
+ Will merge to 'master'.
287
288
289
* es/walken-tutorial (2019-07-02) 1 commit
@@ -496,12 +317,25 @@ of the repositories listed at
317
+ t4210: skip more command-line encoding tests on MinGW
318
+ grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
319
+ log tests: test regex backends in "--encode=<enc>" tests
320
+ (this branch is used by ab/pcre-jit-fixes.)
321
322
Retire use of kwset library, which is an optimization for looking
323
for fixed strings, with use of pcre2 JIT.
324
503
- Needs to wait for a few pcre JIT related fixups, including the
504
- handling of non-UTF8 haystack.
325
+ Kicked out of 'next' to give the topic a chance to get rebooted.
326
+
327
+
328
+* ab/pcre-jit-fixes (2019-07-26) 7 commits
329
+ - grep: do not enter PCRE2_UTF mode on fixed matching
330
+ - grep: stess test PCRE v2 on invalid UTF-8 data
331
+ - grep: create a "is_fixed" member in "grep_pat"
332
+ - grep: consistently use "p->fixed" in compile_regexp()
333
+ - grep: stop using a custom JIT stack with PCRE v1
334
+ - grep: stop "using" a custom JIT stack with PCRE v2
335
+ - grep: remove overly paranoid BUG(...) code
336
+ (this branch uses ab/no-kwset.)
337
+
338
+ A few simplification and bugfixes to PCRE interface.
339
340
341
* md/list-objects-filter-combo (2019-06-28) 10 commits