What's cooking (2015/12 #05)
Junio C Hamano committed
Dec 15, 2015 at 14:34 UTC
e3ef87b0cb01a1a103bae4e5820641396f8bba09
1 file changed
+160
-197
whats-cooking.txt
+160
-197
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Dec 2015, #04; Mon, 14)
4
-X-master-at: 4b9ab0ee0130090c63da2df83747b7b1d834ad98
5
-X-next-at: 4fba3f3effbed332ef436c4725de20dc3dde170c
3
+Subject: What's cooking in git.git (Dec 2015, #05; Tue, 15)
4
+X-master-at: f900c8326a43303685c46b279b9f70411bff1a4b
5
+X-next-at: 94414c4510aaf2ba48821f6dd770ae47f2829dce
6
7
-What's cooking in git.git (Dec 2015, #04; Mon, 14)
7
+What's cooking in git.git (Dec 2015, #05; Tue, 15)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,11 +12,13 @@ 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
-An early preview v2.7.0-rc0 has been tagged. I notice that quite a
16
-few topics have been in "waiting for review" state without getting
17
-anybody helping the review process, leaving them in 'pu'--they will
18
-not have enough time to be part of 2.7 at this rate, but perhaps
19
-that is unavoidable, as this is historically a slow season.
15
+2.7-rc1 has been tagged.
16
+
17
+I notice that quite a few topics have been in "waiting for review"
18
+state without getting anybody helping the review process, leaving
19
+them in 'pu'--they will not be part of 2.7 anyway, but the sooner
20
+they are reviewed, in the more polished shape they can start in
21
+the cycle after 2.7 gets tagged.
22
23
You can find the changes described here in the integration branches of the
24
repositories listed at
@@ -24,61 +26,42 @@ repositories listed at
26
http://git-blame.blogspot.com/p/git-public-repositories.html
27
28
--------------------------------------------------
27
-[Graduated to "master"]
28
-
29
-* cb/t3404-shellquote (2015-12-04) 1 commit
30
- (merged to 'next' on 2015-12-08 at 1a01305)
31
- + t3404: fix quoting of redirect for some versions of bash
32
-
29
+[New Topics]
30
34
-* sb/doc-submodule-sync-recursive (2015-12-04) 1 commit
35
- (merged to 'next' on 2015-12-08 at 7c24ee5)
36
- + document submodule sync --recursive
31
+* cc/untracked (2015-12-15) 10 commits
32
+ - dir: do not use untracked cache ident anymore
33
+ - t7063: add tests for core.untrackedCache
34
+ - config: add core.untrackedCache
35
+ - dir: free untracked cache when removing it
36
+ - dir: add remove_untracked_cache()
37
+ - dir: add add_untracked_cache()
38
+ - update-index: move 'uc' var declaration
39
+ - update-index: add untracked cache notifications
40
+ - update-index: add --test-untracked-cache
41
+ - update-index: use enum for untracked cache options
42
43
+ Update the untracked cache subsystem and change its primary UI from
44
+ "git update-index" to "git config".
45
39
-* sg/lock-file-commit-error (2015-12-01) 1 commit
40
- (merged to 'next' on 2015-12-08 at ef53cd6)
41
- + Make error message after failing commit_lock_file() less confusing
46
+ Needs review.
47
43
- Cosmetic improvement to lock-file error messages.
48
49
+* ep/make-phoney (2015-12-15) 1 commit
50
+ - Makefile: add missing phony target
51
46
-* sn/null-pointer-arith-in-mark-tree-uninteresting (2015-12-07) 1 commit
47
- (merged to 'next' on 2015-12-08 at 91b14e2)
48
- + revision.c: fix possible null pointer arithmetic
52
+ A slight update to the Makefile.
53
50
- mark_tree_uninteresting() has code to handle the case where it gets
51
- passed a NULL pointer in its 'tree' parameter, but the function had
52
- 'object = &tree->object' assignment before checking if tree is
53
- NULL. This gives a compiler an excuse to declare that tree will
54
- never be NULL and apply a wrong optimization. Avoid it.
54
+ Needs review.
55
+ Comments?
56
57
--------------------------------------------------
57
-[New Topics]
58
-
59
-* fr/rebase-i-continue-preserve-options (2015-12-11) 1 commit
60
- - rebase -i: remember merge options beyond continue actions
61
-
62
- "git rebase -i" started with merge strategy options did not
63
- propagate them upon "git rebase --continue".
64
-
65
- Will merge to 'next'.
66
-
67
-
68
-* jk/ident-loosen-getpwuid (2015-12-14) 3 commits
69
- - ident: loosen getpwuid error in non-strict mode
70
- - ident: keep a flag for bogus default_email
71
- - ident: make xgetpwuid_self() a static local helper
58
+[Graduated to "master"]
59
73
- When getpwuid() on the system returned NULL (e.g. the user is not
74
- in the /etc/passwd file or other uid-to-name mappings), the
75
- codepath to find who the user is to record it in the reflog barfed
76
- and died. Loosen the check in this codepath, which already accepts
77
- questionable ident string (e.g. host part of the e-mail address is
78
- obviously bogus), and in general when we operate fmt_ident() function
79
- in non-strict mode.
60
+* ep/ident-with-getaddrinfo (2015-12-14) 1 commit
61
+ (merged to 'next' on 2015-12-15 at 2c19123)
62
+ + ident: fix undefined variable when NO_IPV6 is set
63
81
- Will merge to 'next'.
64
+ A fix-up for a recent topic.
65
66
67
* jk/prune-mtime (2015-08-12) 1 commit
@@ -91,65 +74,26 @@ repositories listed at
74
to do rmdir(), but it would fail on open directory on platforms
75
such as WinXP.
76
94
- Will merge to 'master' and to 'maint'.
95
-
96
-
97
-* sg/completion-no-column (2015-12-11) 1 commit
98
- - completion: remove 'git column' from porcelain commands
99
-
100
- The completion script (in contrib/) used to list "git column"
101
- (which is not an end-user facing command) as one of the choices
102
-
103
- Will merge to 'next'.
104
-
105
-
106
-* ep/ident-with-getaddrinfo (2015-12-14) 1 commit
107
- - ident: fix undefined variable when NO_IPV6 is set
108
-
109
- A fix-up for recent topic.
110
- Will merge to 'next'.
111
-
77
78
* jk/send-email-complete-aliases (2015-12-14) 1 commit
114
- - completion: fix completing unstuck email alias arguments
79
+ (merged to 'next' on 2015-12-15 at 6978ff4)
80
+ + completion: fix completing unstuck email alias arguments
81
116
- A fix-up for recent topic.
117
- Will merge to 'next'.
82
+ A fix-up for a recent topic.
83
84
120
-* ps/push-delete-option (2015-12-14) 2 commits
121
- - push: add '-d' as shorthand for '--delete'
122
- - push: add '--delete' flag to synopsis
123
-
124
- "branch --delete" has "branch -d" but "push --delete" does not.
125
-
126
-
127
-* sh/p4-multi-depot (2015-12-14) 3 commits
128
- - git-p4: reduce number of server queries for fetches
129
- - git-p4: support multiple depot paths in p4 submit
130
- - git-p4: failing test case for skipping changes with multiple depots
131
-
132
- "git p4" when interacting with multiple depots at the same time
133
- used to incorrectly drop changes.
85
+* ls/p4-keep-empty-commits (2015-12-10) 1 commit
86
+ (merged to 'next' on 2015-12-11 at 1827062)
87
+ + git-p4: add option to keep empty commits
88
135
- Waiting for an Ack.
136
- ($gmane/282428)
89
+ "git p4" used to import Perforce CLs that touch only paths outside
90
+ the client spec as empty commits. It has been corrected to ignore
91
+ them instead, with a new configuration git-p4.keepEmptyCommits as a
92
+ backward compatibility knob.
93
94
--------------------------------------------------
95
[Stalled]
96
141
-* vl/grep-configurable-threads (2015-12-04) 1 commit
142
- . grep: add --threads=<num> option and grep.threads configuration
143
-
144
- "git grep" can now be configured (or told from the command line)
145
- how many threads to use when searching in the working tree files.
146
-
147
- There was some review from Eric. Also this seems to break a test.
148
-
149
- Waiting for a reroll, or at least a response.
150
- ($gmane/281160)
151
-
152
-
97
* kf/http-proxy-auth-methods (2015-11-04) 3 commits
98
. SQUASH???
99
. http: use credential API to handle proxy authentication
@@ -166,8 +110,7 @@ repositories listed at
110
pt/http-socks-proxy topic. That is now in master, so it can
111
be re-rolled on top.
112
169
- Still being worked on.
170
- ($gmane/280925)
113
+ Anybody wants to help rerolling this? Otherwise will discard.
114
115
116
* nd/ita-cleanup (2015-09-06) 6 commits
@@ -182,8 +125,8 @@ repositories listed at
125
in the index, but various commands behaved as if they already are.
126
127
Some commits need better explanation.
185
-
186
- Waiting for a reroll.
128
+ Becoming tired of waiting for a reroll.
129
+ Will discard.
130
131
132
* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
@@ -194,6 +137,7 @@ repositories listed at
137
138
Becoming tired of waiting for a reroll.
139
with updated log message ($gmane/268061).
140
+ Will discard.
141
142
143
* wp/sha1-name-negative-match (2015-06-08) 2 commits
@@ -205,15 +149,14 @@ repositories listed at
149
150
Becoming tired of waiting for a reroll.
151
($gmane/271213).
152
+ Anybody wants to help rerolling this? Otherwise will discard.
153
154
155
* ak/format-patch-odir-config (2015-06-19) 1 commit
156
- format-patch: introduce format.outputDirectory configuration
157
213
- Reroll exists but didn't pick it up as it seemed to be still
214
- collecting review comments.
215
-
158
Becoming tired of waiting for a reroll.
159
+ Anybody wants to help rerolling this? Otherwise will discard.
160
($gmane/272180).
161
162
@@ -230,11 +173,79 @@ repositories listed at
173
other place.
174
175
The fix in this patch is broken, unfortunately.
176
+ Will discard.
177
178
--------------------------------------------------
179
[Cooking]
180
237
-* bc/format-patch-null-from-line (2015-12-14) 3 commits
181
+* vl/grep-configurable-threads (2015-12-15) 3 commits
182
+ - grep: add --threads=<num> option and grep.threads configuration
183
+ - grep: slight refactoring to the code that disables threading
184
+ - grep: allow threading even on a single-core machine
185
+
186
+ "git grep" can now be configured (or told from the command line)
187
+ how many threads to use when searching in the working tree files.
188
+
189
+ Needs review.
190
+
191
+
192
+* fr/rebase-i-continue-preserve-options (2015-12-11) 1 commit
193
+ (merged to 'next' on 2015-12-15 at e99677a)
194
+ + rebase -i: remember merge options beyond continue actions
195
+
196
+ "git rebase -i" started with merge strategy options did not
197
+ propagate them upon "git rebase --continue".
198
+
199
+ Will merge to 'master'.
200
+
201
+
202
+* jk/ident-loosen-getpwuid (2015-12-14) 3 commits
203
+ (merged to 'next' on 2015-12-15 at 0c8137b)
204
+ + ident: loosen getpwuid error in non-strict mode
205
+ + ident: keep a flag for bogus default_email
206
+ + ident: make xgetpwuid_self() a static local helper
207
+
208
+ When getpwuid() on the system returned NULL (e.g. the user is not
209
+ in the /etc/passwd file or other uid-to-name mappings), the
210
+ codepath to find who the user is to record it in the reflog barfed
211
+ and died. Loosen the check in this codepath, which already accepts
212
+ questionable ident string (e.g. host part of the e-mail address is
213
+ obviously bogus), and in general when we operate fmt_ident() function
214
+ in non-strict mode.
215
+
216
+ Will merge to 'master'.
217
+
218
+
219
+* sg/completion-no-column (2015-12-11) 1 commit
220
+ (merged to 'next' on 2015-12-15 at 01a2476)
221
+ + completion: remove 'git column' from porcelain commands
222
+
223
+ The completion script (in contrib/) used to list "git column"
224
+ (which is not an end-user facing command) as one of the choices
225
+
226
+ Will merge to 'master'.
227
+
228
+
229
+* ps/push-delete-option (2015-12-14) 2 commits
230
+ - push: add '-d' as shorthand for '--delete'
231
+ - push: add '--delete' flag to synopsis
232
+
233
+ "branch --delete" has "branch -d" but "push --delete" does not.
234
+
235
+
236
+* sh/p4-multi-depot (2015-12-14) 3 commits
237
+ - git-p4: reduce number of server queries for fetches
238
+ - git-p4: support multiple depot paths in p4 submit
239
+ - git-p4: failing test case for skipping changes with multiple depots
240
+
241
+ "git p4" when interacting with multiple depots at the same time
242
+ used to incorrectly drop changes.
243
+
244
+ Reported to be broken.
245
+ ($gmane/282447)
246
+
247
+
248
+* bc/format-patch-null-from-line (2015-12-15) 3 commits
249
- format-patch: check that header line has expected format
250
- format-patch: add an option to suppress commit hash
251
- sha1_file.c: introduce a null_oid constant
@@ -242,7 +253,7 @@ repositories listed at
253
"format-patch" has learned a new option to zero-out the commit
254
object name on the mbox "From " line.
255
245
- Looked reasonable modulo minor niggles in the tests.
256
+ Will merge to 'next'.
257
258
259
* dt/refs-backend-lmdb (2015-12-04) 16 commits
@@ -278,18 +289,6 @@ repositories listed at
289
Waiting for review from 'subtree' folks.
290
291
281
-* ls/p4-keep-empty-commits (2015-12-10) 1 commit
282
- (merged to 'next' on 2015-12-11 at 1827062)
283
- + git-p4: add option to keep empty commits
284
-
285
- "git p4" used to import Perforce CLs that touch only paths outside
286
- the client spec as empty commits. It has been corrected to ignore
287
- them instead, with a new configuration git-p4.keepEmptyCommits as a
288
- backward compatibility knob.
289
-
290
- Will merge to 'master'.
291
-
292
-
292
* nd/clear-gitenv-upon-use-of-alias (2015-12-07) 3 commits
293
. git.c: make sure we do not leak GIT_* to alias scripts
294
- setup.c: re-fix d95138e (setup: set env $GIT_WORK_TREE when ..
@@ -353,11 +352,12 @@ repositories listed at
352
353
354
* jk/send-email-ssl-errors (2015-12-11) 1 commit
356
- - send-email: enable SSL level 1 debug output
355
+ (merged to 'next' on 2015-12-15 at 104f448)
356
+ + send-email: enable SSL level 1 debug output
357
358
Improve error reporting when SMTP TLS fails.
359
360
- Will merge to 'next'.
360
+ Will merge to 'master'.
361
362
363
* ps/rebase-keep-empty (2015-11-24) 2 commits
@@ -385,8 +385,9 @@ repositories listed at
385
386
This series takes the conservative route of requiring scripts to opt
387
into the looser behavior, at the expense of carrying around a new
388
- option-flag forever. I'm not sure if we need to do so. Comments
389
- welcome.
388
+ option-flag forever. I'm not sure if we need to do so.
389
+
390
+ Needs review.
391
392
393
* tb/ls-files-eol (2015-11-28) 2 commits
@@ -421,52 +422,41 @@ repositories listed at
422
Waiting for review from submodule folks.
423
424
424
-* sb/submodule-parallel-update (2015-11-20) 27 commits
425
+* sb/submodule-parallel-fetch (2015-12-14) 8 commits
426
+ - submodules: allow parallel fetching, add tests and documentation
427
+ - fetch_populated_submodules: use new parallel job processing
428
+ - run-command: add an asynchronous parallel child processor
429
+ - sigchain: add command to pop all common signals
430
+ - strbuf: add strbuf_read_once to read without blocking
431
+ - xread_nonblock: add functionality to read from fds without blocking
432
+ - xread: poll on non blocking fds
433
+ - submodule.c: write "Fetching submodule <foo>" to stderr
434
+ (this branch is used by sb/submodule-parallel-update.)
435
+
436
+ Add a framework to spawn a group of processes in parallel, and use
437
+ it to run "git fetch --recurse-submodules" in parallel.
438
+
439
+ Rerolled and this seems to be a lot cleaner. The merge of the
440
+ earlier one to 'next' has been reverted.
441
+
442
+ Will merge to 'next' after a few days.
443
+
444
+
445
+* sb/submodule-parallel-update (2015-12-14) 8 commits
446
- clone: allow an explicit argument for parallel submodule clones
447
- submodule update: expose parallelism to the user
448
- git submodule update: have a dedicated helper for cloning
428
- - fetching submodules: respect `submodule.jobs` config option
449
+ - fetching submodules: respect `submodule.fetchJobs` config option
450
- submodule-config: introduce parse_generic_submodule_config
451
- submodule-config: remove name_and_item_from_var
452
- submodule-config: drop check against NULL
453
- submodule-config: keep update strategy around
433
- - run_processes_parallel: delimit intermixed task output
434
- - Merge branch 'rs/daemon-plug-child-leak' into sb/submodule-parallel-update
435
- - Merge branch 'sb/submodule-parallel-fetch' into sb/submodule-parallel-update
436
- (merged to 'next' on 2015-11-20 at 89fc723)
437
- + strbuf: update documentation for strbuf_read_once()
438
- + run-command: remove set_nonblocking()
439
- (merged to 'next' on 2015-10-23 at 8f04bbd)
440
- + run-command: fix missing output from late callbacks
441
- + test-run-command: increase test coverage
442
- + test-run-command: test for gracefully aborting
443
- + run-command: initialize the shutdown flag
444
- + run-command: clear leftover state from child_process structure
445
- + run-command: fix early shutdown
446
- (merged to 'next' on 2015-10-15 at df63590)
447
- + submodules: allow parallel fetching, add tests and documentation
448
- + fetch_populated_submodules: use new parallel job processing
449
- + run-command: add an asynchronous parallel child processor
450
- + sigchain: add command to pop all common signals
451
- + strbuf: add strbuf_read_once to read without blocking
452
- + xread_nonblock: add functionality to read from fds without blocking
453
- + xread: poll on non blocking fds
454
- + submodule.c: write "Fetching submodule <foo>" to stderr
455
- (this branch is tangled with sb/submodule-parallel-fetch.)
454
+ (this branch uses sb/submodule-parallel-fetch.)
455
456
Builds on top of the "fetch --recurse-submodules" work to introduce
457
parallel downloading into multiple submodules for "submodule update".
458
460
- Waiting for sb/submodule-parallel-fetch to stabilize.
461
-
462
- It would be the cleanest to rebuild sb/submodule-parallel-fetch on
463
- top of 2.7.0 once it ships and then build this directly on top;
464
- that way, we do not have to have merges in this topic that
465
- distracting (besides, some part of the other topic can be updated
466
- in-place instead of this follow-up topic tweaking them as past
467
- mistakes and inflexibility).
468
-
469
- I picked up v4 from the list, but it needs review.
459
+ Needs review.
460
461
462
* jc/strbuf-gets (2015-10-28) 17 commits
@@ -530,8 +520,8 @@ repositories listed at
520
look like RFC2822 headers like "MIME-Version: ...") to be there and
521
ignore them.
522
533
- I have a feeling that that this is a step in a wrong direction.
534
- Comments?
523
+ No comments after waiting for a long time.
524
+ Will discard.
525
526
527
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
@@ -564,8 +554,8 @@ repositories listed at
554
Introduce "%as" and "%aR" placeholders for "log --format" to show
555
the author date in the short and raw formats.
556
567
- I have a feeling that that this is a step in a wrong direction.
568
- Comments?
557
+ No comments after waiting for a long time.
558
+ Will discard.
559
560
561
* jk/graph-format-padding (2015-09-14) 1 commit
@@ -583,40 +573,11 @@ repositories listed at
573
available to those who want to use it, without negatively affecting
574
existing uses.
575
586
- Undecided.
576
+ No comments after waiting for a long time.
577
+ Will discard.
578
($gmane/278326)
579
580
590
-* sb/submodule-parallel-fetch (2015-11-24) 17 commits
591
- (merged to 'next' on 2015-12-04 at 2c5ea47)
592
- + run-command: detect finished children by closed pipe rather than waitpid
593
- (merged to 'next' on 2015-11-20 at 89fc723)
594
- + strbuf: update documentation for strbuf_read_once()
595
- + run-command: remove set_nonblocking()
596
- (merged to 'next' on 2015-10-23 at 8f04bbd)
597
- + run-command: fix missing output from late callbacks
598
- + test-run-command: increase test coverage
599
- + test-run-command: test for gracefully aborting
600
- + run-command: initialize the shutdown flag
601
- + run-command: clear leftover state from child_process structure
602
- + run-command: fix early shutdown
603
- (merged to 'next' on 2015-10-15 at df63590)
604
- + submodules: allow parallel fetching, add tests and documentation
605
- + fetch_populated_submodules: use new parallel job processing
606
- + run-command: add an asynchronous parallel child processor
607
- + sigchain: add command to pop all common signals
608
- + strbuf: add strbuf_read_once to read without blocking
609
- + xread_nonblock: add functionality to read from fds without blocking
610
- + xread: poll on non blocking fds
611
- + submodule.c: write "Fetching submodule <foo>" to stderr
612
- (this branch is tangled with sb/submodule-parallel-update.)
613
-
614
- Add a framework to spawn a group of processes in parallel, and use
615
- it to run "git fetch --recurse-submodules" in parallel.
616
-
617
- Waiting for review.
618
-
619
-
581
* ad/cygwin-wants-rename (2015-08-07) 1 commit
582
- config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
583
@@ -637,6 +598,8 @@ repositories listed at
598
signature that have to be resolved in different ways, but there was
599
no way to record these separate resolutions.
600
601
+ Needs review.
602
+
603
604
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
605
(merged to 'next' on 2015-10-07 at 50fed71)