What's cooking (2017/07 #08)
Junio C Hamano committed
Jul 27, 2017 at 15:41 UTC
1aa0aa942b8307b200a09195ead2d045aa58c704
1 file changed
+193
-73
whats-cooking.txt
+193
-73
@@ -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, #07; Mon, 24)
3
+Subject: What's cooking in git.git (Jul 2017, #08; Thu, 27)
4
X-master-at: 5800c63717ae35286a1441f14ffff753e01f7e2b
5
-X-next-at: 8e98c6e5c05367936b792dc40ed7cc7876e9d4c7
5
+X-next-at: d1ce394fe289eaefa273394076e591331beea529
6
7
-What's cooking in git.git (Jul 2017, #07; Mon, 24)
7
+What's cooking in git.git (Jul 2017, #08; Thu, 27)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,74 +12,161 @@ 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
-With help from Jiang, Dscho and Jean-Noël, we agreed on the way to
16
-handle i18n issues around our custom timestamp_t type and its format
17
-PRItime, and tagging of -rc1 has been delayed a bit. But now it has
18
-happened. There is a small unrelated change still cooking somewhere
19
-else that may have to go in the final release, but other than that
20
-one, no topic is expected to go from 'next' to 'master' until the
21
-final. Regression fixes and reverts are possible but let's hope
22
-there are no need for them.
23
-
15
You can find the changes described here in the integration branches
16
of the repositories listed at
17
18
http://git-blame.blogspot.com/p/git-public-repositories.html
19
20
--------------------------------------------------
30
-[Graduated to "master"]
21
+[New Topics]
22
32
-* jc/po-pritime-fix (2017-07-20) 1 commit
33
- (merged to 'next' on 2017-07-21 at 61f0e3b37f)
34
- + Makefile: help gettext tools to cope with our custom PRItime format
23
+* ah/doc-wserrorhighlight (2017-07-25) 1 commit
24
+ (merged to 'next' on 2017-07-27 at cd1bb28d95)
25
+ + doc: add missing values "none" and "default" for diff.wsErrorHighlight
26
36
- We started using "%" PRItime, imitating "%" PRIuMAX and friends, as
37
- a way to format the internal timestamp value, but this does not
38
- play well with gettext(1) i18n framework, and causes "make pot"
39
- that is run by the l10n coordinator to create a broken po/git.pot
40
- file. This is a possible workaround for that problem.
27
+ Doc update.
28
29
+ Will cook in 'next'.
30
43
-* ks/doc-fixes (2017-07-18) 2 commits
44
- (merged to 'next' on 2017-07-20 at c34b00d0a0)
45
- + doc: reformat the paragraph containing the 'cut-line'
46
- + doc: camelCase the i18n config variables to improve readability
31
48
- Doc clean-up.
32
+* dc/fmt-merge-msg-microcleanup (2017-07-25) 1 commit
33
+ (merged to 'next' on 2017-07-27 at 6df06eb788)
34
+ + fmt-merge-msg: fix coding style
35
36
+ Code cleanup.
37
51
-* rj/cygwin-fread-reads-directories (2017-07-21) 1 commit
52
- (merged to 'next' on 2017-07-21 at 28694cf254)
53
- + config.mak.uname: set FREAD_READS_DIRECTORIES for cygwin
38
+ Will cook in 'next'.
39
55
- It turns out that Cygwin also needs the fopen() wrapper that
56
- returns failure when a directory is opened for reading.
40
58
---------------------------------------------------
59
-[New Topics]
41
+* js/git-gui-msgfmt-on-windows (2017-07-25) 7 commits
42
+ - Merge branch 'js/msgfmt-on-windows' of ../git-gui into js/git-gui-msgfmt-on-windows
43
+ - git-gui (MinGW): make use of MSys2's msgfmt
44
+ - Merge remote-tracking branch 'philoakley/dup-gui'
45
+ - git gui: allow for a long recentrepo list
46
+ - git gui: de-dup selected repo from recentrepo history
47
+ - git gui: cope with duplicates in _get_recentrepo
48
+ - git-gui: remove duplicate entries from .gitconfig's gui.recentrepo
49
61
-* js/run-process-parallel-api-fix (2017-07-21) 1 commit
62
- - run_processes_parallel: change confusing task_cb convention
50
+ Because recent Git for Windows do come with a real msgfmt, the
51
+ build procedure for git-gui has been updated to use it instead of a
52
+ hand-rolled substitute.
53
64
- API fix.
54
+
55
+* jt/subprocess-handshake (2017-07-26) 3 commits
56
+ - sub-process: refactor handshake to common function
57
+ - Documentation: migrate sub-process docs to header
58
+ - Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake
59
+ (this branch uses ls/filter-process-delayed.)
60
+
61
+ Code cleanup.
62
63
Will merge to and cook in 'next'.
64
65
69
-* cc/ref-is-hidden-microcleanup (2017-07-24) 1 commit
70
- - refs: use skip_prefix() in ref_is_hidden()
66
+* lg/merge-signoff (2017-07-25) 1 commit
67
+ - merge: add a --signoff flag
68
72
- Code cleanup.
69
+ "git merge" learned a "--signoff" option to add the Signed-off-by:
70
+ trailer with the committer's name.
71
+
72
+
73
+* pb/trailers-from-command-line (2017-07-25) 4 commits
74
+ - SQUASH???
75
+ - interpret-trailers: add options for actions
76
+ - trailers: introduce struct new_trailer_item
77
+ - trailers: export action enums and corresponding lookup functions
78
+
79
+ "git interpret-trailers" learned to take the trailer specifications
80
+ from the command line that overrides the configured values.
81
+
82
+ Expecting a reroll for compilation fix.
83
+
84
+
85
+* sb/submodule-recursive-checkout-detach-head (2017-07-25) 1 commit
86
+ - recursive submodules: detach HEAD from new state
87
+
88
+ "git checkout --recursive" may overwrite and rewind the history of
89
+ the branch that happens to be checked out in submodule
90
+ repositories, which might not be desirable. Detach the HEAD but
91
+ still allow the recursive checkout to succeed in such a case.
92
+
93
+ Undecided.
94
+ This needs justification in a larger picture; it is unclear why
95
+ this is better than rejecting recursive checkout, for example.
96
+
97
+
98
+* ti/external-sha1dc (2017-07-25) 1 commit
99
+ (merged to 'next' on 2017-07-27 at d1ce394fe2)
100
+ + hash: allow building with the external sha1dc library
101
+
102
+ Platforms that ship with a separate sha1 with collision detection
103
+ library can link to it instead of using the copy we ship as part of
104
+ our source tree.
105
+
106
+ Will cook in 'next'.
107
+
108
+
109
+* bw/submodule-config-cleanup (2017-07-26) 17 commits
110
+ - submodule: remove gitmodules_config
111
+ - unpack-trees: improve loading of .gitmodules
112
+ - submodule-config: lazy-load a repository's .gitmodules file
113
+ - submodule-config: move submodule-config functions to submodule-config.c
114
+ - submodule-config: remove support for overlaying repository config
115
+ - diff: stop allowing diff to have submodules configured in .git/config
116
+ - submodule: remove submodule_config callback routine
117
+ - unpack-trees: don't rely on overlayed config
118
+ - submodule: don't rely on overlayed config when setting diffopts
119
+ - fetch: don't overlay config with submodule-config
120
+ - submodule--helper: don't overlay config in update-clone
121
+ - submodule--helper: don't overlay config in remote_submodule_branch
122
+ - add, reset: ensure submodules can be added or reset
123
+ - submodule: don't use submodule_from_name
124
+ - t7411: check configuration parsing errors
125
+ - Merge branch 'bc/object-id' into bw/submodule-config-cleanup
126
+ - Merge branch 'bw/grep-recurse-submodules' into bw/submodule-config-cleanup
127
+ (this branch uses bc/object-id, bw/grep-recurse-submodules and sb/object-id.)
128
+
129
+ Code clean-up to avoid mixing values read from the .gitmodules file
130
+ and values read from the .git/config file.
131
+
132
+
133
+* jb/t8008-cleanup (2017-07-26) 1 commit
134
+ - t8008: rely on rev-parse'd HEAD instead of sha1 value
135
+
136
+ Code clean-up.
137
138
Will merge to and cook in 'next'.
139
140
77
-* js/blame-lib (2017-07-24) 1 commit
78
- - blame: fix memory corruption scrambling revision name in error message
141
+* rg/rerere-train-overwrite (2017-07-26) 1 commit
142
+ - contrib/rerere-train: optionally overwrite existing resolutions
143
80
- A hotfix to a topic already in 'master'.
144
+ The "rerere-train" script (in contrib/) learned the "--overwrite"
145
+ option to allow overwriting existing recorded resolutions.
146
+
147
+ Will merge to and cook in 'next'.
148
+
149
+
150
+* dl/credential-cache-socket-in-xdg-cache (2017-07-27) 1 commit
151
+ - credential-cache: interpret an ECONNRESET as an EOF
152
82
- Will merge to 'next'.
153
+ A recently added test for the "credential-cache" helper revealed
154
+ that EOF detection done around the time the connection to the cache
155
+ daemon is torn down were flaky. This was fixed by reacting to
156
+ ECONNRESET and behaving as if we got an EOF.
157
+
158
+ Will merge to and cook in 'next'.
159
+
160
+
161
+* eb/contacts-reported-by (2017-07-27) 1 commit
162
+ - git-contacts: also recognise "Reported-by:"
163
+
164
+ "git contacts" (in contrib/) now lists the address on the
165
+ "Reported-by:" trailer to its output, in addition to those on
166
+ S-o-b: and other trailers, to make it easier to notify (and thank)
167
+ the original bug reporter.
168
+
169
+ Will merge to and cook in 'next'.
170
171
--------------------------------------------------
172
[Stalled]
@@ -125,7 +212,7 @@ of the repositories listed at
212
cf. <xmqqmv8zhdap.fsf@gitster.mtv.corp.google.com>
213
214
128
-* js/rebase-i-final (2017-06-15) 10 commits
215
+* js/rebase-i-final (2017-07-27) 10 commits
216
- rebase -i: rearrange fixup/squash lines using the rebase--helper
217
- t3415: test fixup with wrapped oneline
218
- rebase -i: skip unnecessary picks using the rebase--helper
@@ -141,19 +228,59 @@ of the repositories listed at
228
the shell script to C.
229
230
Expecting a reroll.
144
- This is at its v5.
145
- cf. <cover.1497444257.git.johannes.schindelin@gmx.de>
231
+
232
+
233
+* bp/fsmonitor (2017-06-12) 6 commits
234
+ - fsmonitor: add a sample query-fsmonitor hook script for Watchman
235
+ - fsmonitor: add documentation for the fsmonitor extension.
236
+ - fsmonitor: add test cases for fsmonitor extension
237
+ - fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.
238
+ - dir: make lookup_untracked() available outside of dir.c
239
+ - bswap: add 64 bit endianness helper get_be64
240
+
241
+ We learned to talk to watchman to speed up "git status".
242
+
243
+ Expecting a reroll.
244
+ cf. <bade1166-e646-b05a-f65b-adb8da8ba0a7@gmail.com>
245
246
--------------------------------------------------
247
[Cooking]
248
249
+* js/run-process-parallel-api-fix (2017-07-21) 1 commit
250
+ (merged to 'next' on 2017-07-27 at 4b54b69172)
251
+ + run_processes_parallel: change confusing task_cb convention
252
+
253
+ API fix.
254
+
255
+ Will cook in 'next'.
256
+
257
+
258
+* cc/ref-is-hidden-microcleanup (2017-07-24) 1 commit
259
+ (merged to 'next' on 2017-07-27 at 37af544e1c)
260
+ + refs: use skip_prefix() in ref_is_hidden()
261
+
262
+ Code cleanup.
263
+
264
+ Will cook in 'next'.
265
+
266
+
267
+* js/blame-lib (2017-07-24) 1 commit
268
+ (merged to 'next' on 2017-07-26 at db0d081012)
269
+ + blame: fix memory corruption scrambling revision name in error message
270
+
271
+ A hotfix to a topic already in 'master'.
272
+
273
+ Will merge to 'master'.
274
+
275
+
276
* bw/push-options-recursively-to-submodules (2017-07-20) 1 commit
151
- - submodule--helper: teach push-check to handle HEAD
277
+ (merged to 'next' on 2017-07-27 at 26b3af2544)
278
+ + submodule--helper: teach push-check to handle HEAD
279
280
"git push --recurse-submodules $there HEAD:$target" was not
281
propagated down to the submodules, but now it is.
282
156
- Will merge to and cook in 'next'.
283
+ Will cook in 'next'.
284
285
286
* jc/http-sslkey-and-ssl-cert-are-paths (2017-07-20) 1 commit
@@ -167,7 +294,9 @@ of the repositories listed at
294
Will cook in 'next'.
295
296
170
-* jt/fsck-code-cleanup (2017-07-20) 2 commits
297
+* jt/fsck-code-cleanup (2017-07-26) 3 commits
298
+ (merged to 'next' on 2017-07-26 at 7a17e279da)
299
+ + fsck: cleanup unused variable
300
(merged to 'next' on 2017-07-20 at f7045a8c47)
301
+ object: remove "used" field from struct object
302
+ fsck: remove redundant parse_tree() invocation
@@ -227,6 +356,7 @@ of the repositories listed at
356
- cache.h: add GITMODULES_FILE macro
357
- repository: have the_repository use the_index
358
- repo_read_index: don't discard the index
359
+ (this branch is used by bw/submodule-config-cleanup.)
360
361
362
* bw/object-id (2017-07-17) 3 commits
@@ -241,13 +371,14 @@ of the repositories listed at
371
372
373
* ks/commit-abort-on-empty-message-fix (2017-07-17) 1 commit
244
- - commit: check for empty message before the check for untouched template
374
+ (merged to 'next' on 2017-07-27 at e81ad4c1dc)
375
+ + commit: check for empty message before the check for untouched template
376
377
"git commit" when seeing an totally empty message said "you did not
378
edit the message", which is clearly wrong. The message has been
379
corrected.
380
250
- Will merge to and cook in 'next'.
381
+ Will cook in 'next'.
382
383
384
* rs/bswap-ubsan-fix (2017-07-17) 2 commits
@@ -285,18 +416,20 @@ of the repositories listed at
416
(merged to 'next' on 2017-07-20 at c78e758b23)
417
+ rebase: make resolve message clearer for inexperienced users
418
288
- Code clean-up.
419
+ The advice message given when "git rebase" stops for conflicting
420
+ changes has been improved.
421
422
Will cook in 'next'.
423
424
425
* hb/gitweb-project-list (2017-07-18) 1 commit
294
- - gitweb: skip unreadable subdirectories
426
+ (merged to 'next' on 2017-07-27 at c25d65ca25)
427
+ + gitweb: skip unreadable subdirectories
428
429
When a directory is not readable, "gitweb" fails to build the
430
project list. Work this around by skipping such a directory.
431
299
- Undecided.
432
+ Will cook in 'next'.
433
434
It might end up hiding a problem under the rug and a better
435
solution might be to loudly complain to the administrator pointing
@@ -334,7 +467,7 @@ of the repositories listed at
467
(merged to 'next' on 2017-07-18 at e4df0ba3b1)
468
+ tag: convert gpg_verify_tag to use struct object_id
469
+ commit: convert lookup_commit_graft to struct object_id
337
- (this branch is used by bc/object-id.)
470
+ (this branch is used by bc/object-id and bw/submodule-config-cleanup.)
471
472
Conversion from uchar[20] to struct object_id continues.
473
@@ -376,7 +509,6 @@ of the repositories listed at
509
possibly turn `--force` into `--force-with-lease`.
510
511
Undecided.
379
-
512
Independent from disabling the feature by default, this stirred up
513
a discussion to replace the DWIM heuristics with a better one, which
514
deserves to be its own topic.
@@ -397,7 +529,7 @@ of the repositories listed at
529
+ submodule: convert submodule config lookup to use object_id
530
+ builtin/merge-tree: convert remaining caller of get_sha1 to object_id
531
+ builtin/fsck: convert remaining caller of get_sha1 to object_id
400
- (this branch uses sb/object-id.)
532
+ (this branch is used by bw/submodule-config-cleanup; uses sb/object-id.)
533
534
Conversion from uchar[20] to struct object_id continues.
535
@@ -461,7 +593,9 @@ of the repositories listed at
593
Will cook in 'next'.
594
595
464
-* mh/packed-ref-store (2017-07-03) 30 commits
596
+* mh/packed-ref-store (2017-07-27) 31 commits
597
+ (merged to 'next' on 2017-07-27 at 857dcb8cba)
598
+ + packed_ref_store: handle a packed-refs file that is a symlink
599
(merged to 'next' on 2017-07-05 at 6c68c603cc)
600
+ read_packed_refs(): die if `packed-refs` contains bogus data
601
+ t3210: add some tests of bogus packed-refs file contents
@@ -497,7 +631,6 @@ of the repositories listed at
631
The "ref-store" code reorganization continues.
632
633
Will cook in 'next'.
500
- cf. <CAGZ79kY=N5H2q1SB9ZEtt1EvuAQg+bqVBZNoXE6nLgtoUd2txA@mail.gmail.com>
634
635
636
* sd/branch-copy (2017-06-18) 3 commits
@@ -526,6 +659,7 @@ of the repositories listed at
659
+ t0021: write "OUT <size>" only on success
660
+ t0021: make debug log file name configurable
661
+ t0021: keep filter log files on comparison
662
+ (this branch is used by jt/subprocess-handshake.)
663
664
The filter-process interface learned to allow a process with long
665
latency give a "delayed" response.
@@ -533,20 +667,6 @@ of the repositories listed at
667
Will cook in 'next'.
668
669
536
-* bp/fsmonitor (2017-06-12) 6 commits
537
- - fsmonitor: add a sample query-fsmonitor hook script for Watchman
538
- - fsmonitor: add documentation for the fsmonitor extension.
539
- - fsmonitor: add test cases for fsmonitor extension
540
- - fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.
541
- - dir: make lookup_untracked() available outside of dir.c
542
- - bswap: add 64 bit endianness helper get_be64
543
-
544
- We learned to talk to watchman to speed up "git status".
545
-
546
- Expecting a reroll.
547
- cf. <bade1166-e646-b05a-f65b-adb8da8ba0a7@gmail.com>
548
-
549
-
670
* sb/diff-color-move (2017-06-30) 26 commits
671
(merged to 'next' on 2017-07-06 at 758ed40e4f)
672
+ diff: document the new --color-moved setting