What's cooking (2015/11 #04)
Jeff King committed
Nov 24, 2015 at 20:01 UTC
9dd6b0e43aeb61c4104e403fc34c4884fbaf2255
1 file changed
+347
-216
whats-cooking.txt
+347
-216
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2015, #03; Fri, 20)
4
-X-master-at: 0c83680e9c047170614fb08ef222ea4f460e514d
5
-X-next-at: dc6ae483b6062dec4979462c5b072d883a323fee
3
+Subject: What's cooking in git.git (Nov 2015, #04; Tue, 24)
4
+X-master-at: 1bc8feaa7cc752fe3b902ccf83ae9332e40921db
5
+X-next-at: ac6eb1c9efff97a4f02a0d094c9cc5fe314d4449
6
7
-What's cooking in git.git (Nov 2015, #03; Fri, 20)
7
+What's cooking in git.git (Nov 2015, #04; Tue, 24)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -35,235 +35,159 @@ and all topic branches at:
35
36
But note that I will _not_ be pushing to kernel.org.
37
38
-
38
--------------------------------------------------
39
[New Topics]
40
42
-* ap/doc-env-variable-format (2015-11-11) 1 commit
43
- - Documentation: make environment variable formatting more consistent
44
-
45
- Minor documentation fixup.
46
-
47
- Will merge to 'next'.
48
-
49
-
50
-* cb/hook-sigpipe (2015-11-16) 1 commit
51
- - allow hooks to ignore their standard input stream
52
-
53
- We now consistently allow all hooks to ignore their standard input,
54
- rather than having git complain of SIGPIPE.
55
-
56
- Will merge to 'next'.
57
-
58
-
59
-* dg/subtree-test-cleanup (2015-11-13) 7 commits
60
- - contrib/subtree: Handle '--prefix' argument with a slash appended
61
- - contrib/subtree: Make each test self-contained
62
- - contrib/subtree: Add split tests
63
- - contrib/subtree: Add merge tests
64
- - contrib/subtree: Add tests for subtree add
65
- - contrib/subtree: Add test for missing subtree
66
- - contrib/subtree: Clean and refactor test code
67
-
68
- Test cleanups for the subtree project.
69
-
70
- Will merge to 'next'.
41
+* bb/merge-marker-crlf (2015-11-24) 1 commit
42
+ - merge-file: consider core.crlf when writing merge markers
43
44
+ Write out merge markers using system end-of-line convention.
45
73
-* dk/check-ignore-docs (2015-11-20) 1 commit
74
- - check-ignore: correct documentation about output
46
+ Waiting for a re-roll to handle gitattributes.
47
76
- Documentation clarification for "check-ignore" without "--verbose".
48
78
- This may be losing information, and we would want to enhance the
79
- "--verbose" documentation.
49
+* cb/ssl-config-pathnames (2015-11-24) 1 commit
50
+ (merged to 'next' on 2015-11-24 at 658a9c9)
51
+ + http: treat config options sslCAPath and sslCAInfo as paths
52
81
- Will hold for comments.
53
+ Allow tilde-expansion in some http config variables.
54
83
-
84
-* dk/rerere-train-quoting (2015-11-20) 1 commit
85
- - Escape Git's exec path in contrib/rerere-train.sh script
86
-
87
- Fix shell quoting in contrib script.
88
-
89
- Will merge to 'next'.
55
+ Will merge to 'master'.
56
57
92
-* dk/t5813-unc-paths (2015-11-20) 1 commit
93
- - t5813: avoid creating urls that break on cygwin
58
+* dk/gc-more-wo-pack (2015-11-24) 3 commits
59
+ - gc: Clean garbage .bitmap files from pack dir
60
+ - t5304: Add test for .bitmap garbage files
61
+ - prepare_packed_git(): find more garbage
62
95
- Test portability fix for a topic in v2.6.1.
63
+ Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
64
+ .bitmap and .keep files.
65
97
- Will merge to 'next'.
66
+ Waiting for review.
67
68
100
-* ec/annotate-deleted (2015-11-20) 1 commit
101
- - annotate: skip checking working tree if a revision is provided
69
+* dt/http-range (2015-11-11) 1 commit
70
+ (merged to 'next' on 2015-11-24 at d342999)
71
+ + http: fix some printf format warnings
72
103
- Usability fix for annotate-specific "<file> <rev>" syntax with deleted
104
- files.
73
+ Portability fix for a topic already in 'master'.
74
106
- Needs review.
75
+ Will merge to 'master'.
76
77
109
-* fm/shell-path-whitespace (2015-11-13) 1 commit
110
- - rebase-i-exec: Allow space in SHELL_PATH
78
+* jk/send-email-ssl-errors (2015-11-24) 1 commit
79
+ - send-email: enable SSL level 1 debug output
80
112
- Portability fix for Windows, which may rewrite $SHELL variable using
113
- non-POSIX paths.
81
+ Improve error reporting when SMTP TLS fails.
82
83
Will merge to 'next'.
84
85
118
-* jk/filter-branch-no-index (2015-11-06) 1 commit
119
- - filter-branch: skip index read/write when possible
120
-
121
- Speed up filter-branch for cases where we only care about rewriting
122
- commits, not tree data.
123
-
124
- Needs review.
125
-
126
-
127
-* jk/send-email-ca-path (2015-11-20) 1 commit
128
- - send-email: die if CA path doesn't exist
129
-
130
- Use a safer behavior when we hit errors verifying remote certificates.
131
-
132
- We may want to update this to guide users toward workarounds.
133
-
134
-
135
-* jk/send-email-complete-aliases (2015-11-20) 2 commits
136
- - completion: add support for completing email aliases
137
- - sendemail: teach git-send-email to dump alias names
138
-
139
- Teach send-email to dump mail aliases, so that we can do tab completion
140
- on the command line.
141
-
142
- This is v4. Is everybody happy with this one?
143
-
144
-
145
-* jk/send-email-expand-paths (2015-11-20) 2 commits
146
- - send-email: expand paths in sendemail.{to,cc}cmd config
147
- - send-email: expand path in sendemail.smtpsslcertpath config
148
-
149
- Expand paths in some send-email config variables.
150
-
151
- Needs review.
86
+* mg/doc-word-diff-example (2015-11-24) 1 commit
87
+ (merged to 'next' on 2015-11-24 at 5ba28db)
88
+ + Documentation/diff: give --word-diff-regex=. example
89
90
+ Will merge to 'master'.
91
154
-* js/test-modernize-t9300 (2015-11-20) 7 commits
155
- - modernize t9300: move test preparations into test_expect_success
156
- - modernize t9300: mark here-doc words to ignore tab indentation
157
- - modernize t9300: use test_when_finished for clean-up
158
- - modernize t9300: wrap lines after &&
159
- - modernize t9300: use test_must_be_empty
160
- - modernize t9300: use test_must_fail
161
- - modernize t9300: single-quote placement and indentation
92
163
- Clean up style in an ancient test.
93
+* mr/ff-refs (2015-11-24) 5 commits
94
+ - ff-refs: Add tests
95
+ - ff-refs: Add documentation
96
+ - ff-refs: add --dry-run and --skip-worktree options
97
+ - ff-refs: update each updatable ref
98
+ - ff-refs: builtin cmd to check and fast forward local refs to their upstream
99
165
- Will merge to 'next'.
100
+ Specialized command to fast-forward refs to match their upstream.
101
102
+ I remain skeptical that this is necessary or sufficient. Comments
103
+ welcome.
104
168
-* ls/p4-test-timeouts (2015-11-20) 3 commits
169
- - git-p4: add trap to kill p4d on test exit
170
- - git-p4: add p4d timeout in tests
171
- - git-p4: retry kill/cleanup operations in tests with timeout
172
-
173
- Work around some test flakiness with p4d.
105
+ Will hold.
106
175
- Will merge to 'next'.
107
108
+* ps/rebase-keep-empty (2015-11-24) 2 commits
109
+ - rebase: fix preserving commits with --keep-empty
110
+ - rebase: test broken behavior with --keep-empty
111
178
-* ls/test-must-fail-sigpipe (2015-11-20) 2 commits
179
- - add "ok=sigpipe" to test_must_fail and use it to fix flaky tests
180
- - implement test_might_fail using a refactored test_must_fail
112
+ Keep duplicate commits via rebase --keep-empty.
113
182
- Fix some racy client/server tests by treating SIGPIPE the same as a
183
- normal non-zero exit.
114
+ I'm not sure if I agree with this interpretation of the "rebase
115
+ --keep-empty" documentation, but I haven't thought too hard about it.
116
+ Comments welcome.
117
185
- Will merge to 'next'.
118
+ Waiting for review.
119
120
188
-* mc/push-recurse-submodules-config (2015-11-20) 1 commit
189
- - push: add recurseSubmodules config option
121
+* rm/subtree-unwrap-tags (2015-11-24) 1 commit
122
+ - contrib/subtree: unwrap tag refs
123
191
- Add new config to avoid typing "--recurse-submodules" on each push.
124
+ Waiting for review from subtree folks.
125
193
- People seemed to like v1, but v2 didn't see a lot of review. Is
194
- everybody happy?
126
127
+* sg/bash-prompt-dirty-orphan (2015-11-24) 3 commits
128
+ (merged to 'next' on 2015-11-24 at ac6eb1c)
129
+ + bash prompt: indicate dirty index even on orphan branches
130
+ + bash prompt: remove a redundant 'git diff' option
131
+ + bash prompt: test dirty index and worktree while on an orphan branch
132
197
-* mk/blame-first-parent (2015-11-20) 1 commit
198
- - blame: fix object casting regression
133
+ Produce correct "dirty" marker for shell prompts, even when we
134
+ are on an orphan branch.
135
200
- Regression fix for a topic already in master.
136
+ Will cook in 'next', then merge to 'master'.
137
202
- Will merge to 'next'.
138
139
+* sg/filter-branch-dwim-ambiguity (2015-11-24) 1 commit
140
+ (merged to 'next' on 2015-11-24 at fe596a6)
141
+ + filter-branch: deal with object name vs. pathname ambiguity in tree-filter
142
205
-* np/credential-cache-sighup (2015-11-20) 1 commit
206
- - credential-cache: new option to ignore sighup
143
+ Fix for a corner case in filter-branch.
144
208
- Workaround for using credential-cache with emacs.
145
+ Will merge to 'master'.
146
210
- Will merge to 'next'.
147
148
+* sg/sh-require-clean-orphan (2015-11-24) 2 commits
149
+ - sh-setup: make require_clean_work_tree() work on orphan branches
150
+ - Add tests for git-sh-setup's require_clean_work_tree()
151
213
-* rs/fsck-nul-header (2015-11-20) 2 commits
214
- - fsck: treat a NUL in a tag header as an error
215
- - t1450: add tests for NUL in headers of commits and tags
152
+ Allow users of git-sh-setup to handle orphan branch state.
153
217
- Fsck did not correctly detect a NUL-truncated header in a tag.
154
+ This series takes the conservative route of requiring scripts to opt
155
+ into the looser behavior, at the expense of carrying around a new
156
+ option-flag forever. I'm not sure if we need to do so. Comments
157
+ welcome.
158
219
- Will merge to 'next'.
159
+ Will merge to 'next' in a few days.
160
161
222
-* rs/parseopt-short-help (2015-11-20) 5 commits
223
- - show-ref: stop using PARSE_OPT_NO_INTERNAL_HELP
224
- - grep: stop using PARSE_OPT_NO_INTERNAL_HELP
225
- - parse-options: allow -h as a short option
226
- - parse-options: inline parse_options_usage() at its only remaining caller
227
- - parse-options: deduplicate parse_options_usage() calls
162
+* tb/ls-files-eol (2015-11-24) 1 commit
163
+ - ls-files: Add eol diagnostics
164
229
- Make "-h" command line option work more consistently in all commands.
165
+ Add options to ls-files to help diagnose end-of-line problems.
166
231
- Needs review.
167
+ This latest round hasn't gotten any review yet.
168
169
+ Waiting for review.
170
171
--------------------------------------------------
172
[Graduated to "master"]
173
237
-* dg/git-svn-empty-dirs (2015-11-05) 1 commit
238
- - git-svn: improve rebase/mkdirs performance
239
-
240
- This came via a pull from Eric's git-svn tree, and I dropped the
241
- topic branch that Junio had created.
174
175
244
-* dk/gc-idx-wo-pack (2015-11-04) 3 commits
245
- (merged to 'next' on 2015-11-05 at af058fa)
246
- + gc: remove garbage .idx files from pack dir
247
- + t5304: test cleaning pack garbage
248
- + prepare_packed_git(): refactor garbage reporting in pack directory
249
-
250
- Having a leftover .idx file without corresponding .pack file in
251
- the repository hurts performance; "git gc" learned to prune them.
176
+* fp/subtree-todo-update (2015-11-06) 1 commit
177
+ (merged to 'next' on 2015-11-20 at 3861698)
178
+ + contrib/subtree: remove "push" command from the "todo" file
179
253
- We may want to do the same for .bitmap (and notice but not prune
254
- .keep) without corresponding .pack, but that can be a separate
255
- topic.
180
+ Will merge to 'master'.
181
182
258
-* lf/ref-is-hidden-namespace (2015-11-05) 4 commits
259
- (merged to 'next' on 2015-11-05 at b245404)
260
- + t5509: add basic tests for hideRefs
261
- + hideRefs: add support for matching full refs
262
- + upload-pack: strip refs before calling ref_is_hidden()
263
- + config.txt: document the semantics of hideRefs with namespaces
183
+* rc/configure-use-libs-when-checking-a-lib (2015-11-06) 1 commit
184
+ (merged to 'next' on 2015-11-20 at 37c26aa)
185
+ + configure.ac: use $LIBS not $CFLAGS when testing -lpthread
186
265
- Extend transfer.hideRefs to work better with use of namespaces.
187
+ The "configure" script did not test for -lpthread correctly, which
188
+ upset some linkers.
189
190
+ Will merge to 'master'.
191
192
--------------------------------------------------
193
[Stalled]
@@ -284,14 +208,6 @@ But note that I will _not_ be pushing to kernel.org.
208
Waiting for a reroll.
209
210
287
-* ld/p4-detached-head (2015-09-09) 2 commits
288
- - git-p4: work with a detached head
289
- - git-p4: add failing test for submit from detached head
290
-
291
- Will be rerolled.
292
- ($gmane/277574)
293
-
294
-
211
* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
212
- t/lib-git-svn: check same httpd module dirs as lib-httpd
213
- t/lib-httpd: load mod_unixd
@@ -340,36 +256,241 @@ But note that I will _not_ be pushing to kernel.org.
256
--------------------------------------------------
257
[Cooking]
258
343
-* dt/refs-backend-pre-vtable (2015-11-20) 10 commits
344
- - refs: break out ref conflict checks
345
- - files_log_ref_write: new function
346
- - initdb: make safe_create_dir public
347
- - refs: split filesystem-based refs code into a new file
348
- - refs/refs-internal.h: new header file
349
- - refname_is_safe(): improve docstring
350
- - pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref()
351
- - copy_msg(): rename to copy_reflog_msg()
352
- - verify_refname_available(): new function
353
- - verify_refname_available(): rename function
259
+* ar/doc-env-variable-format (2015-11-11) 1 commit
260
+ (merged to 'next' on 2015-11-24 at 5ddf33e)
261
+ + Documentation: make environment variable formatting more consistent
262
355
- Code preparation for pluggable ref backends.
263
+ Minor documentation fixup.
264
357
- This is the slimmed-down version from Michael, v8. It applies a lot
358
- more pleasantly than the old one.
265
+ Will merge to 'master'.
266
360
- Will merge to 'next'.
267
268
+* ld/p4-detached-head (2015-11-24) 3 commits
269
+ (merged to 'next' on 2015-11-24 at 36ab36a)
270
+ + git-p4: work with a detached head
271
+ + git-p4: add option to system() to return subshell status
272
+ + git-p4: add failing test for submit from detached head
273
363
-* rc/configure-use-libs-when-checking-a-lib (2015-11-06) 1 commit
364
- (merged to 'next' on 2015-11-20 at 37c26aa)
365
- + configure.ac: use $LIBS not $CFLAGS when testing -lpthread
274
+ Make git-p4 work on a detached head.
275
367
- The "configure" script did not test for -lpthread correctly, which
368
- upset some linkers.
276
+ Will merge to 'master'.
277
+
278
+
279
+* cb/hook-sigpipe (2015-11-16) 1 commit
280
+ (merged to 'next' on 2015-11-24 at 0bf4228)
281
+ + allow hooks to ignore their standard input stream
282
+
283
+ We now consistently allow all hooks to ignore their standard input,
284
+ rather than having git complain of SIGPIPE.
285
+
286
+ Will merge to 'master'.
287
+
288
+
289
+* dg/subtree-test-cleanup (2015-11-13) 7 commits
290
+ (merged to 'next' on 2015-11-24 at 1297941)
291
+ + contrib/subtree: Handle '--prefix' argument with a slash appended
292
+ + contrib/subtree: Make each test self-contained
293
+ + contrib/subtree: Add split tests
294
+ + contrib/subtree: Add merge tests
295
+ + contrib/subtree: Add tests for subtree add
296
+ + contrib/subtree: Add test for missing subtree
297
+ + contrib/subtree: Clean and refactor test code
298
+
299
+ Test cleanups for the subtree project.
300
+
301
+ Will merge to 'master'.
302
+
303
+
304
+* dk/check-ignore-docs (2015-11-24) 1 commit
305
+ (merged to 'next' on 2015-11-24 at 0cce5c5)
306
+ + check-ignore: correct documentation about output
307
+
308
+ Documentation clarification for "check-ignore" without "--verbose".
309
+
310
+ Will merge to 'master'.
311
+
312
+
313
+* dk/rerere-train-quoting (2015-11-20) 1 commit
314
+ (merged to 'next' on 2015-11-24 at f9fa96e)
315
+ + Escape Git's exec path in contrib/rerere-train.sh script
316
+
317
+ Fix shell quoting in contrib script.
318
319
Will merge to 'master'.
320
321
322
+* dk/t5813-unc-paths (2015-11-20) 1 commit
323
+ (merged to 'next' on 2015-11-24 at 204e4a8)
324
+ + t5813: avoid creating urls that break on cygwin
325
+
326
+ Test portability fix for a topic in v2.6.1.
327
+
328
+ Will merge to 'master'.
329
+
330
+
331
+* ec/annotate-deleted (2015-11-20) 1 commit
332
+ - annotate: skip checking working tree if a revision is provided
333
+
334
+ Usability fix for annotate-specific "<file> <rev>" syntax with deleted
335
+ files.
336
+
337
+ Needs review.
338
+
339
+
340
+* fm/shell-path-whitespace (2015-11-13) 1 commit
341
+ (merged to 'next' on 2015-11-24 at c2b8bdf)
342
+ + rebase-i-exec: Allow space in SHELL_PATH
343
+
344
+ Portability fix for Windows, which may rewrite $SHELL variable using
345
+ non-POSIX paths.
346
+
347
+ Will merge to 'master'.
348
+
349
+
350
+* jk/filter-branch-no-index (2015-11-06) 1 commit
351
+ (merged to 'next' on 2015-11-24 at e31946e)
352
+ + filter-branch: skip index read/write when possible
353
+
354
+ Speed up filter-branch for cases where we only care about rewriting
355
+ commits, not tree data.
356
+
357
+ Will merge to 'master' two cycles from now.
358
+
359
+
360
+* jk/send-email-ca-path (2015-11-24) 1 commit
361
+ (merged to 'next' on 2015-11-24 at 923b803)
362
+ + send-email: die if CA path doesn't exist
363
+
364
+ Use a safer behavior when we hit errors verifying remote certificates.
365
+
366
+ Will merge to 'master'.
367
+
368
+
369
+* jk/send-email-complete-aliases (2015-11-20) 2 commits
370
+ (merged to 'next' on 2015-11-24 at a50094f)
371
+ + completion: add support for completing email aliases
372
+ + sendemail: teach git-send-email to dump alias names
373
+
374
+ Teach send-email to dump mail aliases, so that we can do tab completion
375
+ on the command line.
376
+
377
+ Will merge to 'master' two cycles from now.
378
+
379
+
380
+* jk/send-email-expand-paths (2015-11-20) 1 commit
381
+ (merged to 'next' on 2015-11-24 at d32fa4d)
382
+ + send-email: expand path in sendemail.smtpsslcertpath config
383
+
384
+ Expand paths in some send-email config variables.
385
+
386
+ Will merge to 'master'.
387
+
388
+
389
+* js/test-modernize-t9300 (2015-11-20) 7 commits
390
+ (merged to 'next' on 2015-11-24 at d399494)
391
+ + modernize t9300: move test preparations into test_expect_success
392
+ + modernize t9300: mark here-doc words to ignore tab indentation
393
+ + modernize t9300: use test_when_finished for clean-up
394
+ + modernize t9300: wrap lines after &&
395
+ + modernize t9300: use test_must_be_empty
396
+ + modernize t9300: use test_must_fail
397
+ + modernize t9300: single-quote placement and indentation
398
+
399
+ Clean up style in an ancient test.
400
+
401
+ Will merge to 'master'.
402
+
403
+
404
+* ls/p4-test-timeouts (2015-11-20) 3 commits
405
+ (merged to 'next' on 2015-11-24 at 905cff8)
406
+ + git-p4: add trap to kill p4d on test exit
407
+ + git-p4: add p4d timeout in tests
408
+ + git-p4: retry kill/cleanup operations in tests with timeout
409
+
410
+ Work around some test flakiness with p4d.
411
+
412
+ Will merge to 'master'.
413
+
414
+
415
+* ls/test-must-fail-sigpipe (2015-11-24) 3 commits
416
+ - SQUASH???
417
+ - add "ok=sigpipe" to test_must_fail and use it to fix flaky tests
418
+ - implement test_might_fail using a refactored test_must_fail
419
+
420
+ Fix some racy client/server tests by treating SIGPIPE the same as a
421
+ normal non-zero exit.
422
+
423
+ Will hold pending logic cleanups.
424
+
425
+
426
+* mc/push-recurse-submodules-config (2015-11-20) 1 commit
427
+ (merged to 'next' on 2015-11-24 at 3644d4b)
428
+ + push: add recurseSubmodules config option
429
+
430
+ Add new config to avoid typing "--recurse-submodules" on each push.
431
+
432
+ Waiting for review from submodule folks.
433
+
434
+
435
+* mk/blame-first-parent (2015-11-24) 1 commit
436
+ (merged to 'next' on 2015-11-24 at a2ee2a4)
437
+ + blame: fix object casting regression
438
+
439
+ Regression fix for a topic already in master.
440
+
441
+ Will merge to 'master'.
442
+
443
+
444
+* np/credential-cache-sighup (2015-11-20) 1 commit
445
+ (merged to 'next' on 2015-11-24 at 410167f)
446
+ + credential-cache: new option to ignore sighup
447
+
448
+ Workaround for using credential-cache with emacs.
449
+
450
+ Will merge to 'master' two cycles from now.
451
+
452
+
453
+* rs/fsck-nul-header (2015-11-20) 2 commits
454
+ (merged to 'next' on 2015-11-24 at 093b3d6)
455
+ + fsck: treat a NUL in a tag header as an error
456
+ + t1450: add tests for NUL in headers of commits and tags
457
+
458
+ Fsck did not correctly detect a NUL-truncated header in a tag.
459
+
460
+ Will merge to 'master'.
461
+
462
+
463
+* rs/parseopt-short-help (2015-11-20) 5 commits
464
+ (merged to 'next' on 2015-11-24 at f22b6e0)
465
+ + show-ref: stop using PARSE_OPT_NO_INTERNAL_HELP
466
+ + grep: stop using PARSE_OPT_NO_INTERNAL_HELP
467
+ + parse-options: allow -h as a short option
468
+ + parse-options: inline parse_options_usage() at its only remaining caller
469
+ + parse-options: deduplicate parse_options_usage() calls
470
+
471
+ Make "-h" command line option work more consistently in all commands.
472
+
473
+ Needs review.
474
+
475
+
476
+* dt/refs-backend-pre-vtable (2015-11-20) 10 commits
477
+ (merged to 'next' on 2015-11-24 at 8fd7293)
478
+ + refs: break out ref conflict checks
479
+ + files_log_ref_write: new function
480
+ + initdb: make safe_create_dir public
481
+ + refs: split filesystem-based refs code into a new file
482
+ + refs/refs-internal.h: new header file
483
+ + refname_is_safe(): improve docstring
484
+ + pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref()
485
+ + copy_msg(): rename to copy_reflog_msg()
486
+ + verify_refname_available(): new function
487
+ + verify_refname_available(): rename function
488
+
489
+ Code preparation for pluggable ref backends.
490
+
491
+ Will cook in 'next'.
492
+
493
+
494
* ad/sha1-update-chunked (2015-11-05) 2 commits
495
- sha1: allow limiting the size of the data passed to SHA1_Update()
496
- sha1: provide another level of indirection for the SHA-1 functions
@@ -389,6 +510,8 @@ But note that I will _not_ be pushing to kernel.org.
510
511
I haven't reviewed v6 yet. More eyes are welcome.
512
513
+ Needs review.
514
+
515
516
* kf/http-proxy-auth-methods (2015-11-04) 3 commits
517
. SQUASH???
@@ -409,14 +532,7 @@ But note that I will _not_ be pushing to kernel.org.
532
($gmane/280925).
533
534
412
-* fp/subtree-todo-update (2015-11-06) 1 commit
413
- (merged to 'next' on 2015-11-20 at 3861698)
414
- + contrib/subtree: remove "push" command from the "todo" file
415
-
416
- Will merge to 'master'.
417
-
418
-
419
-* sb/submodule-parallel-update (2015-11-20) 11 commits
535
+* sb/submodule-parallel-update (2015-11-20) 27 commits
536
- clone: allow an explicit argument for parallel submodule clones
537
- submodule update: expose parallelism to the user
538
- git submodule update: have a dedicated helper for cloning
@@ -428,7 +544,26 @@ But note that I will _not_ be pushing to kernel.org.
544
- run_processes_parallel: delimit intermixed task output
545
- Merge branch 'rs/daemon-plug-child-leak' into sb/submodule-parallel-update
546
- Merge branch 'sb/submodule-parallel-fetch' into sb/submodule-parallel-update
431
- (this branch uses sb/submodule-parallel-fetch.)
547
+ (merged to 'next' on 2015-11-20 at 89fc723)
548
+ + strbuf: update documentation for strbuf_read_once()
549
+ + run-command: remove set_nonblocking()
550
+ (merged to 'next' on 2015-10-23 at 8f04bbd)
551
+ + run-command: fix missing output from late callbacks
552
+ + test-run-command: increase test coverage
553
+ + test-run-command: test for gracefully aborting
554
+ + run-command: initialize the shutdown flag
555
+ + run-command: clear leftover state from child_process structure
556
+ + run-command: fix early shutdown
557
+ (merged to 'next' on 2015-10-15 at df63590)
558
+ + submodules: allow parallel fetching, add tests and documentation
559
+ + fetch_populated_submodules: use new parallel job processing
560
+ + run-command: add an asynchronous parallel child processor
561
+ + sigchain: add command to pop all common signals
562
+ + strbuf: add strbuf_read_once to read without blocking
563
+ + xread_nonblock: add functionality to read from fds without blocking
564
+ + xread: poll on non blocking fds
565
+ + submodule.c: write "Fetching submodule <foo>" to stderr
566
+ (this branch is tangled with sb/submodule-parallel-fetch.)
567
568
Builds on top of the "fetch --recurse-submodules" work to introduce
569
parallel downloading into multiple submodules for "submodule update".
@@ -473,15 +608,15 @@ But note that I will _not_ be pushing to kernel.org.
608
Waiting for reviews.
609
610
476
-* eg/p4-submit-catch-failure (2015-10-30) 1 commit
477
- - git-p4: clean up after p4 submit failure
611
+* eg/p4-submit-catch-failure (2015-11-24) 1 commit
612
+ (merged to 'next' on 2015-11-24 at cf2dc76)
613
+ + git-p4: clean up after p4 submit failure
614
615
Just like the working tree is cleaned up when the user cancelled
616
submission in P4Submit.applyCommit(), clean up the mess if "p4
617
submit" fails.
618
483
- Needs an update to test.
484
- ($gmane/280539)
619
+ Will merge to 'master'.
620
621
622
* ep/ident-with-getaddrinfo (2015-10-30) 1 commit
@@ -495,18 +630,13 @@ But note that I will _not_ be pushing to kernel.org.
630
($gmane/280507)
631
632
498
-* jc/test-must-fail-with-sigpipe (2015-10-30) 1 commit
499
- . test: accept death by SIGPIPE as a valid failure mode
500
-
501
- Discarded in favor of ls/test-must-fail-sigpipe.
502
-
633
* pt/http-socks-proxy (2015-11-20) 1 commit
634
(merged to 'next' on 2015-11-20 at dc6ae48)
635
+ remote-http(s): support SOCKS proxies
636
637
Add support for talking http/https over socks proxy.
638
509
- Will cook in 'next'.
639
+ Will merge to 'master'.
640
641
642
* mh/notes-allow-reading-treeish (2015-10-08) 3 commits
@@ -616,7 +746,8 @@ But note that I will _not_ be pushing to kernel.org.
746
($gmane/278326)
747
748
619
-* sb/submodule-parallel-fetch (2015-11-05) 16 commits
749
+* sb/submodule-parallel-fetch (2015-11-24) 17 commits
750
+ . run-command: detect finished children by closed pipe rather than waitpid
751
(merged to 'next' on 2015-11-20 at 89fc723)
752
+ strbuf: update documentation for strbuf_read_once()
753
+ run-command: remove set_nonblocking()
@@ -636,12 +767,12 @@ But note that I will _not_ be pushing to kernel.org.
767
+ xread_nonblock: add functionality to read from fds without blocking
768
+ xread: poll on non blocking fds
769
+ submodule.c: write "Fetching submodule <foo>" to stderr
639
- (this branch is used by sb/submodule-parallel-update.)
770
+ (this branch is tangled with sb/submodule-parallel-update.)
771
772
Add a framework to spawn a group of processes in parallel, and use
773
it to run "git fetch --recurse-submodules" in parallel.
774
644
- I merged the removal of the non-blocking descriptors to 'next'.
775
+ Is everybody happy with the topic commit?
776
777
Will cook in 'next'.
778