What's cooking (2017/07 #06)
Junio C Hamano committed
Jul 20, 2017 at 17:17 UTC
dfd4e100dfa3ac33687f41a9f97e765a482c72a5
1 file changed
+179
-152
whats-cooking.txt
+179
-152
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jul 2017, #05; Tue, 18)
4
-X-master-at: cac25fc330fc26050dcbc92c4bfff169a4848e93
5
-X-next-at: a5a5890e50e4d3c12611adc886e44b2c07a74a76
3
+Subject: What's cooking in git.git (Jul 2017, #06; Thu, 20)
4
+X-master-at: 981adb928e5ebe8bbf84d80a8f8fb3a4cbc30afd
5
+X-next-at: 6ee059e2f3ee8b8553e8fe6adb297897e619ac91
6
7
-What's cooking in git.git (Jul 2017, #05; Tue, 18)
7
+What's cooking in git.git (Jul 2017, #06; Thu, 20)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,10 +12,11 @@ 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
-A maintenance release for 2.13.x series, and the first preview for
16
-2.14 series -rc0, have been tagged. Let's close the 'master' except
17
-for obvious fixes and clean-ups and concentrate on regressions from
18
-now on.
15
+Tagging of -rc1 is delayed, waiting for a resolution on the l10n
16
+issues around '"%"PRItime' custome format specifier, which naturally
17
+cannot be handled by gettext(1) suite nicely. I think what is queued
18
+on 'pu' based on Dscho's suggestion is a usable workaround, and I
19
+plan to use it unless I hear better ideas in the comint 10+ hours.
20
21
You can find the changes described here in the integration branches
22
of the repositories listed at
@@ -25,102 +26,12 @@ of the repositories listed at
26
--------------------------------------------------
27
[Graduated to "master"]
28
28
-* jk/gc-pre-detach-under-hook (2017-07-12) 1 commit
29
- (merged to 'next' on 2017-07-12 at 9cf44c2b07)
30
- + gc: run pre-detach operations under lock
31
-
32
- We run an early part of "git gc" that deals with refs before
33
- daemonising (and not under lock) even when running a background
34
- auto-gc, which caused multiple gc processes attempting to run the
35
- early part at the same time. This is now prevented by running the
36
- early part also under the GC lock.
37
-
38
-
39
-* jn/hooks-pre-rebase-sample-fix (2017-07-11) 1 commit
40
- (merged to 'next' on 2017-07-12 at ed86887454)
41
- + pre-rebase hook: capture documentation in a <<here document
42
-
43
- Code clean-up, that makes us in sync with Debian by one patch.
44
-
45
-
46
-* rs/progress-overall-throughput-at-the-end (2017-07-09) 1 commit
47
- (merged to 'next' on 2017-07-11 at f5168e975b)
48
- + progress: show overall rate in last update
49
-
50
- The progress meter did not give a useful output when we haven't had
51
- 0.5 seconds to measure the throughput during the interval. Instead
52
- show the overall throughput rate at the end, which is a much more
53
- useful number.
54
-
55
-
56
-* tb/push-to-cygwin-unc-path (2017-07-05) 1 commit
57
- (merged to 'next' on 2017-07-11 at 4d9c3f82bd)
58
- + cygwin: allow pushing to UNC paths
59
-
60
- On Cygwin, similar to Windows, "git push //server/share/repository"
61
- ought to mean a repository on a network share that can be accessed
62
- locally, but this did not work correctly due to stripping the double
63
- slashes at the beginning.
64
-
65
- This may need to be heavily tested before it gets unleashed to the
66
- wild, as the change is at a fairly low-level code and would affect
67
- not just the code to decide if the push destination is local. There
68
- may be unexpected fallouts in the path normalization.
69
-
70
---------------------------------------------------
71
-[New Topics]
72
-
73
-* jk/c99 (2017-07-18) 2 commits
74
- (merged to 'next' on 2017-07-18 at 1cfc30f7c1)
75
- + clean.c: use designated initializer
76
- + strbuf: use designated initializers in STRBUF_INIT
77
-
78
- Start using selected c99 constructs in small, stable and
79
- essentialpart of the system to catch people who care about
80
- older compilers that do not grok them.
81
-
82
- Will cook in 'next'.
83
-
84
-
85
-* jk/check-ref-format-oor-fix (2017-07-14) 1 commit
86
- - check-ref-format: require a repository for --branch
87
-
88
- Objected...
89
- cf. <20170717172709.GL93855@aiede.mtv.corp.google.com>
90
-
91
-
92
-* bw/grep-recurse-submodules (2017-07-18) 10 commits
93
- - grep: recurse in-process using 'struct repository'
94
- - submodule: merge repo_read_gitmodules and gitmodules_config
95
- - submodule: check for unmerged .gitmodules outside of config parsing
96
- - submodule: check for unstaged .gitmodules outside of config parsing
97
- - submodule: remove fetch.recursesubmodules from submodule-config parsing
98
- - submodule: remove submodule.fetchjobs from submodule-config parsing
99
- - config: add config_from_gitmodules
100
- - cache.h: add GITMODULES_FILE macro
101
- - repository: have the_repository use the_index
102
- - repo_read_index: don't discard the index
103
-
104
-
105
-* bw/object-id (2017-07-17) 3 commits
106
- (merged to 'next' on 2017-07-18 at 90d27c0e7c)
107
- + receive-pack: don't access hash of NULL object_id pointer
108
- + notes: don't access hash of NULL object_id pointer
109
- + tree-diff: don't access hash of NULL object_id pointer
110
-
111
- Conversion from uchar[20] to struct object_id continues.
112
-
113
- Will merge to 'master'.
114
-
115
-
29
* ew/fd-cloexec-fix (2017-07-17) 1 commit
30
(merged to 'next' on 2017-07-18 at a3de1b1998)
31
+ set FD_CLOEXEC properly when O_CLOEXEC is not supported
32
33
Portability/fallback fix.
34
122
- Will merge to 'master'.
123
-
35
36
* jk/build-with-asan (2017-07-17) 1 commit
37
(merged to 'next' on 2017-07-18 at f92636c616)
@@ -130,8 +41,6 @@ of the repositories listed at
41
compiling but supported only one sanitize option. Allow more than
42
one to be combined, joined with a comma, like "make SANITIZE=foo,bar".
43
133
- Will merge to 'master'.
134
-
44
45
* jk/test-copy-bytes-fix (2017-07-17) 1 commit
46
(merged to 'next' on 2017-07-18 at c32c264e96)
@@ -139,8 +48,6 @@ of the repositories listed at
48
49
A test fix.
50
142
- Will merge to 'master'.
143
-
51
52
* js/alias-case-sensitivity (2017-07-17) 2 commits
53
(merged to 'next' on 2017-07-18 at 31641a39f2)
@@ -149,65 +56,79 @@ of the repositories listed at
56
57
A recent update broke an alias that contained an uppercase letter.
58
152
- Will merge to 'master'.
59
60
+* mt/p4-parse-G-output (2017-07-13) 3 commits
61
+ (merged to 'next' on 2017-07-18 at e065b689d4)
62
+ + git-p4: filter for {'code':'info'} in p4CmdList
63
+ + git-p4: parse marshal output "p4 -G" in p4 changes
64
+ + git-p4: git-p4 tests with p4 triggers
65
155
-* ks/commit-abort-on-empty-message-fix (2017-07-17) 1 commit
156
- - commit: check for empty message before the check for untouched template
66
+ Use "p4 -G" to make "p4 changes" output more Python-friendly
67
+ to parse.
68
158
- "git commit" when seeing an totally empty message said "you did not
159
- edit the message", which is clearly wrong. The message has been
160
- corrected.
69
+--------------------------------------------------
70
+[New Topics]
71
162
- Will merge to 'next'.
72
+* bw/push-options-recursively-to-submodules (2017-07-20) 1 commit
73
+ - submodule--helper: teach push-check to handle HEAD
74
75
+ "git push --recurse-submodules $there HEAD:$target" was not
76
+ propagated down to the submodules, but now it is.
77
165
-* ks/doc-fixes (2017-07-17) 1 commit
166
- - doc: camelCase the i18n config variables to improve readability
78
+ Will merge to and cook in 'next'.
79
168
- Will merge to 'next'.
80
81
+* jc/http-sslkey-and-ssl-cert-are-paths (2017-07-20) 1 commit
82
+ (merged to 'next' on 2017-07-20 at 5489304b99)
83
+ + http.c: http.sslcert and http.sslkey are both pathnames
84
171
-* rs/bswap-ubsan-fix (2017-07-17) 2 commits
172
- - bswap: convert get_be16, get_be32 and put_be32 to inline functions
173
- - bswap: convert to unsigned before shifting in get_be32
85
+ The http.{sslkey,sslCert} configuration variables are to be
86
+ interpreted as a pathname that honors "~[username]/" prefix, but
87
+ weren't, which has been fixed.
88
175
- Will merge to 'next'.
89
+ Will cook in 'next'.
90
91
178
-* rs/move-array (2017-07-17) 4 commits
179
- - ls-files: don't try to prune an empty index
180
- - apply: use COPY_ARRAY and MOVE_ARRAY in update_image()
181
- - use MOVE_ARRAY
182
- - add MOVE_ARRAY
92
+* jc/po-pritime-fix (2017-07-20) 1 commit
93
+ - Makefile: help gettext tools to cope with our custom PRItime format
94
184
- Will merge to 'next'.
95
+ We started using "%" PRItime, imitating "%" PRIuMAX and friends, as
96
+ a way to format the internal timestamp value, but this does not
97
+ play well with gettext(1) i18n framework, and causes "make pot"
98
+ that is run by the l10n coordinator to create a broken po/git.pot
99
+ file. This is a possible workaround for that problem.
100
101
+ Will fast-track to 2.14-rc1 once we hear positive result.
102
187
-* rs/stat-data-unaligned-reads-fix (2017-07-17) 1 commit
188
- - dir: support platforms that require aligned reads
103
190
- Will merge to 'next'.
104
+* jt/fsck-code-cleanup (2017-07-20) 2 commits
105
+ (merged to 'next' on 2017-07-20 at f7045a8c47)
106
+ + object: remove "used" field from struct object
107
+ + fsck: remove redundant parse_tree() invocation
108
109
+ Code clean-up.
110
193
-* wd/rebase-conflict-guide (2017-07-17) 1 commit
194
- - rebase: make resolve message clearer for inexperienced users
111
+ Will cook in 'next'.
112
196
- Will merge to 'next'.
113
114
+* rs/pack-objects-pbase-cleanup (2017-07-20) 1 commit
115
+ (merged to 'next' on 2017-07-20 at a6b618559b)
116
+ + pack-objects: remove unnecessary NULL check
117
199
-* hb/gitweb-project-list (2017-07-18) 1 commit
200
- - gitweb: skip unreadable subdirectories
118
+ Code clean-up.
119
202
- When a directory is not readable, "gitweb" fails to build the
203
- project list. Work this around by skipping such a directory.
120
+ Will cook in 'next'.
121
205
- Undecided.
122
207
- It might end up hiding a problem under the rug and a better
208
- solution might be to loudly complain to the administrator pointing
209
- out the problematic directory, but this will at least make it
210
- "work".
123
+* st/lib-gpg-kill-stray-agent (2017-07-20) 1 commit
124
+ (merged to 'next' on 2017-07-20 at 8ea68c483f)
125
+ + t: lib-gpg: flush gpg agent on startup
126
+
127
+ Some versions of GnuPG fails to kill gpg-agent it auto-spawned
128
+ and such a left-over agent can interfere with a test. Work it
129
+ around by attempting to kill one before starting a new test.
130
+
131
+ Will cook in 'next'.
132
133
--------------------------------------------------
134
[Stalled]
@@ -275,6 +196,123 @@ of the repositories listed at
196
--------------------------------------------------
197
[Cooking]
198
199
+* jk/c99 (2017-07-18) 2 commits
200
+ (merged to 'next' on 2017-07-18 at 1cfc30f7c1)
201
+ + clean.c: use designated initializer
202
+ + strbuf: use designated initializers in STRBUF_INIT
203
+
204
+ Start using selected c99 constructs in small, stable and
205
+ essentialpart of the system to catch people who care about
206
+ older compilers that do not grok them.
207
+
208
+ Will cook in 'next'.
209
+
210
+
211
+* jk/check-ref-format-oor-fix (2017-07-14) 1 commit
212
+ - check-ref-format: require a repository for --branch
213
+
214
+ Objected...
215
+ cf. <20170717172709.GL93855@aiede.mtv.corp.google.com>
216
+
217
+
218
+* bw/grep-recurse-submodules (2017-07-18) 10 commits
219
+ - grep: recurse in-process using 'struct repository'
220
+ - submodule: merge repo_read_gitmodules and gitmodules_config
221
+ - submodule: check for unmerged .gitmodules outside of config parsing
222
+ - submodule: check for unstaged .gitmodules outside of config parsing
223
+ - submodule: remove fetch.recursesubmodules from submodule-config parsing
224
+ - submodule: remove submodule.fetchjobs from submodule-config parsing
225
+ - config: add config_from_gitmodules
226
+ - cache.h: add GITMODULES_FILE macro
227
+ - repository: have the_repository use the_index
228
+ - repo_read_index: don't discard the index
229
+
230
+
231
+* bw/object-id (2017-07-17) 3 commits
232
+ (merged to 'next' on 2017-07-18 at 90d27c0e7c)
233
+ + receive-pack: don't access hash of NULL object_id pointer
234
+ + notes: don't access hash of NULL object_id pointer
235
+ + tree-diff: don't access hash of NULL object_id pointer
236
+
237
+ Conversion from uchar[20] to struct object_id continues.
238
+
239
+ Will cook in 'next'.
240
+
241
+
242
+* ks/commit-abort-on-empty-message-fix (2017-07-17) 1 commit
243
+ - commit: check for empty message before the check for untouched template
244
+
245
+ "git commit" when seeing an totally empty message said "you did not
246
+ edit the message", which is clearly wrong. The message has been
247
+ corrected.
248
+
249
+ Will merge to and cook in 'next'.
250
+
251
+
252
+* ks/doc-fixes (2017-07-18) 2 commits
253
+ (merged to 'next' on 2017-07-20 at c34b00d0a0)
254
+ + doc: reformat the paragraph containing the 'cut-line'
255
+ + doc: camelCase the i18n config variables to improve readability
256
+
257
+ Doc clean-up.
258
+
259
+ Will merge to 'master'.
260
+
261
+
262
+* rs/bswap-ubsan-fix (2017-07-17) 2 commits
263
+ (merged to 'next' on 2017-07-20 at ce6bad07b0)
264
+ + bswap: convert get_be16, get_be32 and put_be32 to inline functions
265
+ + bswap: convert to unsigned before shifting in get_be32
266
+
267
+ Code clean-up.
268
+
269
+ Will cook in 'next'.
270
+
271
+
272
+* rs/move-array (2017-07-17) 4 commits
273
+ (merged to 'next' on 2017-07-20 at f3086cd20e)
274
+ + ls-files: don't try to prune an empty index
275
+ + apply: use COPY_ARRAY and MOVE_ARRAY in update_image()
276
+ + use MOVE_ARRAY
277
+ + add MOVE_ARRAY
278
+
279
+ Code clean-up.
280
+
281
+ Will cook in 'next'.
282
+
283
+
284
+* rs/stat-data-unaligned-reads-fix (2017-07-17) 1 commit
285
+ (merged to 'next' on 2017-07-20 at e7d3782823)
286
+ + dir: support platforms that require aligned reads
287
+
288
+ Code clean-up.
289
+
290
+ Will cook in 'next'.
291
+
292
+
293
+* wd/rebase-conflict-guide (2017-07-17) 1 commit
294
+ (merged to 'next' on 2017-07-20 at c78e758b23)
295
+ + rebase: make resolve message clearer for inexperienced users
296
+
297
+ Code clean-up.
298
+
299
+ Will cook in 'next'.
300
+
301
+
302
+* hb/gitweb-project-list (2017-07-18) 1 commit
303
+ - gitweb: skip unreadable subdirectories
304
+
305
+ When a directory is not readable, "gitweb" fails to build the
306
+ project list. Work this around by skipping such a directory.
307
+
308
+ Undecided.
309
+
310
+ It might end up hiding a problem under the rug and a better
311
+ solution might be to loudly complain to the administrator pointing
312
+ out the problematic directory, but this will at least make it
313
+ "work".
314
+
315
+
316
* jk/ref-filter-colors (2017-07-13) 15 commits
317
(merged to 'next' on 2017-07-18 at 75d4eb7ecf)
318
+ ref-filter: consult want_color() before emitting colors
@@ -309,7 +347,7 @@ of the repositories listed at
347
348
Conversion from uchar[20] to struct object_id continues.
349
312
- Will merge to 'master'.
350
+ Will cook in 'next'.
351
352
353
* rs/sha1-file-micro-optim (2017-07-09) 2 commits
@@ -346,7 +384,7 @@ of the repositories listed at
384
by users who know what they are doing. This would pave the way to
385
possibly turn `--force` into `--force-with-lease`.
386
349
- Will wait for feedback, then merge to and cook in 'next'.
387
+ Undecided.
388
389
Independent from disabling the feature by default, this stirred up
390
a discussion to replace the DWIM heuristics with a better one, which
@@ -372,7 +410,7 @@ of the repositories listed at
410
411
Conversion from uchar[20] to struct object_id continues.
412
375
- Will merge to 'master'.
413
+ Will cook in 'next'.
414
415
416
* jk/reflog-walk (2017-07-09) 9 commits
@@ -416,18 +454,6 @@ of the repositories listed at
454
Will cook in 'next'.
455
456
419
-* mt/p4-parse-G-output (2017-07-13) 3 commits
420
- (merged to 'next' on 2017-07-18 at e065b689d4)
421
- + git-p4: filter for {'code':'info'} in p4CmdList
422
- + git-p4: parse marshal output "p4 -G" in p4 changes
423
- + git-p4: git-p4 tests with p4 triggers
424
-
425
- Use "p4 -G" to make "p4 changes" output more Python-friendly
426
- to parse.
427
-
428
- Will merge to 'master'.
429
-
430
-
457
* ex/deprecate-empty-pathspec-as-match-all (2017-06-23) 2 commits
458
(merged to 'next' on 2017-06-26 at d026281517)
459
+ pathspec: die on empty strings as pathspec
@@ -480,6 +506,7 @@ of the repositories listed at
506
The "ref-store" code reorganization continues.
507
508
Will cook in 'next'.
509
+ cf. <CAGZ79kY=N5H2q1SB9ZEtt1EvuAQg+bqVBZNoXE6nLgtoUd2txA@mail.gmail.com>
510
511
512
* sd/branch-copy (2017-06-18) 3 commits