What's cooking (2015/12 #01)
Jeff King committed
Dec 1, 2015 at 19:20 UTC
8e1d110250ec259e1f22fa7f65a7829f214dde47
1 file changed
+321
-259
whats-cooking.txt
+321
-259
@@ -1,29 +1,19 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2015, #04; Tue, 24)
4
-X-master-at: 1bc8feaa7cc752fe3b902ccf83ae9332e40921db
5
-X-next-at: ac6eb1c9efff97a4f02a0d094c9cc5fe314d4449
3
+Subject: What's cooking in git.git (Dec 2015, #01; Tue, 1)
4
+X-master-at: fd13a2ecfbda734a54e22695e0219e89682bdd22
5
+X-next-at: a22bf4777ab14f7322ba61781952635899ef89e7
6
7
-What's cooking in git.git (Nov 2015, #04; Tue, 24)
7
+What's cooking in git.git (Dec 2015, #01; Tue, 1)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-Sorry for the extreme delay in pushing out my tree. I ended up busier
15
-than I expected during the first week of Junio's absence, and then it
16
-took me a while to dig myself out of the ever-filling hole of incoming
17
-topics. :)
18
-
19
-Expect quite a few new topics in this edition. A number of them have
20
-seen review already, and I'm planning to merge them to "next" fairly
21
-quickly (I may do another integration cycle late tonight or tomorrow
22
-with those changes).
23
-
24
-I still have a few threads to comb through on the list. If you don't see
25
-the latest version of your topic here, please feel free to ping me, or
26
-to repost.
14
+This should by my final whats-cooking before handing things back to
15
+Junio. Thanks all for review help and for your patience during the past
16
+few weeks.
17
18
You can find the normal integration branches at:
19
@@ -38,12 +28,111 @@ But note that I will _not_ be pushing to kernel.org.
28
--------------------------------------------------
29
[New Topics]
30
41
-* bb/merge-marker-crlf (2015-11-24) 1 commit
42
- - merge-file: consider core.crlf when writing merge markers
31
+* bc/object-id (2015-11-20) 12 commits
32
+ - remote: convert functions to struct object_id
33
+ - Remove get_object_hash.
34
+ - Convert struct object to object_id
35
+ - Add several uses of get_object_hash.
36
+ - object: introduce get_object_hash macro.
37
+ - ref_newer: convert to use struct object_id
38
+ - push_refs_with_export: convert to struct object_id
39
+ - get_remote_heads: convert to struct object_id
40
+ - parse_fetch: convert to use struct object_id
41
+ - add_sought_entry_mem: convert to struct object_id
42
+ - Convert struct ref to use object_id.
43
+ - sha1_file: introduce has_object_file helper.
44
+
45
+ More transition from "unsigned char[40]" to "struct object_id".
46
+
47
+ This needed a few merge fixups, but is mostly disentangled from other
48
+ topics.
49
44
- Write out merge markers using system end-of-line convention.
50
+ Will merge to 'next'.
51
+
52
+
53
+* dt/fsck-verify-pack-error (2015-12-01) 1 commit
54
+ - verify_pack: do not ignore return value of verification function
55
+
56
+ The exit code of git-fsck would not reflect some types of errors found
57
+ in packed objects.
58
+
59
+ Will merge to 'next'.
60
+
61
+
62
+* kn/ref-filter-atom-parsing (2015-12-01) 10 commits
63
+ - ref-filter: introduce objectname_atom_parser()
64
+ - ref-filter: introduce contents_atom_parser()
65
+ - ref-filter: introduce remote_ref_atom_parser()
66
+ - ref-filter: introduce align_atom_parser()
67
+ - strbuf: introduce strbuf_split_str_without_term()
68
+ - ref-filter: introduce color_atom_parser()
69
+ - ref-filter: skip deref specifier in match_atom_name()
70
+ - ref-fitler: bump match_atom() name to the top
71
+ - ref-filter: introduce struct used_atom
72
+ - ref-filter: introduce a parsing function for each atom in valid_atom
73
+
74
+ Refactoring of ref-filter's format-parsing code, in preparation
75
+ for "branch --format" and friends.
76
+
77
+ This replaces (for now) kn/for-each-ref-remainder, which will be built
78
+ on top.
79
+
80
+ Waiting for review.
81
+
82
+
83
+* ls/travis-yaml (2015-11-28) 1 commit
84
+ - Add Travis CI support
85
+
86
+ Provides the necessary infrastructure to build topics using the free
87
+ Travis CI. Developers forking from this topic (and enabling Travis) can
88
+ do their own builds, and we can turn on auto-builds for git/git
89
+ (including build-status for pull requests that people open).
90
+
91
+ I'm inclined to merge this up, as the worst case is that it becomes
92
+ dormant cruft in the repository root.
93
+
94
+ Will merge to 'next'.
95
+
96
+
97
+* rs/status-detached-head-memcmp (2015-11-28) 1 commit
98
+ - wt-status: correct and simplify check for detached HEAD
99
+
100
+ Fix some string-matching corner cases when digging in the reflog for
101
+ "git status".
102
+
103
+ Will merge to 'next', then 'maint'.
104
46
- Waiting for a re-roll to handle gitattributes.
105
+
106
+* sg/lock-file-commit-error (2015-12-01) 1 commit
107
+ - Make error message after failing commit_lock_file() less confusing
108
+
109
+ Cosmetic improvement to lock-file error messages.
110
+
111
+ Comments on the new messages?
112
+
113
+ Will merge to 'next' after giving time for bikeshedding.
114
+
115
+
116
+--------------------------------------------------
117
+[Graduated to "master"]
118
+
119
+* ar/doc-env-variable-format (2015-11-11) 1 commit
120
+ (merged to 'next' on 2015-11-24 at 5ddf33e)
121
+ + Documentation: make environment variable formatting more consistent
122
+
123
+ Minor documentation fixup.
124
+
125
+ Will merge to 'master'.
126
+
127
+
128
+* cb/hook-sigpipe (2015-11-16) 1 commit
129
+ (merged to 'next' on 2015-11-24 at 0bf4228)
130
+ + allow hooks to ignore their standard input stream
131
+
132
+ We now consistently allow all hooks to ignore their standard input,
133
+ rather than having git complain of SIGPIPE.
134
+
135
+ Will merge to 'master'.
136
137
138
* cb/ssl-config-pathnames (2015-11-24) 1 commit
@@ -55,15 +144,46 @@ But note that I will _not_ be pushing to kernel.org.
144
Will merge to 'master'.
145
146
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
147
+* dg/subtree-test-cleanup (2015-11-13) 7 commits
148
+ (merged to 'next' on 2015-11-24 at 1297941)
149
+ + contrib/subtree: Handle '--prefix' argument with a slash appended
150
+ + contrib/subtree: Make each test self-contained
151
+ + contrib/subtree: Add split tests
152
+ + contrib/subtree: Add merge tests
153
+ + contrib/subtree: Add tests for subtree add
154
+ + contrib/subtree: Add test for missing subtree
155
+ + contrib/subtree: Clean and refactor test code
156
63
- Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
64
- .bitmap and .keep files.
157
+ Test cleanups for the subtree project.
158
+
159
+ Will merge to 'master'.
160
+
161
+
162
+* dk/check-ignore-docs (2015-11-24) 1 commit
163
+ (merged to 'next' on 2015-11-24 at 0cce5c5)
164
+ + check-ignore: correct documentation about output
165
+
166
+ Documentation clarification for "check-ignore" without "--verbose".
167
+
168
+ Will merge to 'master'.
169
66
- Waiting for review.
170
+
171
+* dk/rerere-train-quoting (2015-11-20) 1 commit
172
+ (merged to 'next' on 2015-11-24 at f9fa96e)
173
+ + Escape Git's exec path in contrib/rerere-train.sh script
174
+
175
+ Fix shell quoting in contrib script.
176
+
177
+ Will merge to 'master'.
178
+
179
+
180
+* dk/t5813-unc-paths (2015-11-20) 1 commit
181
+ (merged to 'next' on 2015-11-24 at 204e4a8)
182
+ + t5813: avoid creating urls that break on cygwin
183
+
184
+ Test portability fix for a topic in v2.6.1.
185
+
186
+ Will merge to 'master'.
187
188
189
* dt/http-range (2015-11-11) 1 commit
@@ -75,117 +195,122 @@ But note that I will _not_ be pushing to kernel.org.
195
Will merge to 'master'.
196
197
78
-* jk/send-email-ssl-errors (2015-11-24) 1 commit
79
- - send-email: enable SSL level 1 debug output
198
+* eg/p4-submit-catch-failure (2015-11-24) 1 commit
199
+ (merged to 'next' on 2015-11-24 at cf2dc76)
200
+ + git-p4: clean up after p4 submit failure
201
81
- Improve error reporting when SMTP TLS fails.
202
+ Just like the working tree is cleaned up when the user cancelled
203
+ submission in P4Submit.applyCommit(), clean up the mess if "p4
204
+ submit" fails.
205
83
- Will merge to 'next'.
206
+ Will merge to 'master'.
207
208
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
209
+* fm/shell-path-whitespace (2015-11-13) 1 commit
210
+ (merged to 'next' on 2015-11-24 at c2b8bdf)
211
+ + rebase-i-exec: Allow space in SHELL_PATH
212
+
213
+ Portability fix for Windows, which may rewrite $SHELL variable using
214
+ non-POSIX paths.
215
216
Will merge to 'master'.
217
218
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
-
100
- Specialized command to fast-forward refs to match their upstream.
219
+* jk/send-email-ca-path (2015-11-24) 1 commit
220
+ (merged to 'next' on 2015-11-24 at 923b803)
221
+ + send-email: die if CA path doesn't exist
222
102
- I remain skeptical that this is necessary or sufficient. Comments
103
- welcome.
223
+ Use a safer behavior when we hit errors verifying remote certificates.
224
105
- Will hold.
225
+ Will merge to 'master'.
226
227
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
228
+* jk/send-email-expand-paths (2015-11-20) 1 commit
229
+ (merged to 'next' on 2015-11-24 at d32fa4d)
230
+ + send-email: expand path in sendemail.smtpsslcertpath config
231
112
- Keep duplicate commits via rebase --keep-empty.
232
+ Expand paths in some send-email config variables.
233
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.
234
+ Will merge to 'master'.
235
118
- Waiting for review.
236
237
+* js/test-modernize-t9300 (2015-11-20) 7 commits
238
+ (merged to 'next' on 2015-11-24 at d399494)
239
+ + modernize t9300: move test preparations into test_expect_success
240
+ + modernize t9300: mark here-doc words to ignore tab indentation
241
+ + modernize t9300: use test_when_finished for clean-up
242
+ + modernize t9300: wrap lines after &&
243
+ + modernize t9300: use test_must_be_empty
244
+ + modernize t9300: use test_must_fail
245
+ + modernize t9300: single-quote placement and indentation
246
121
-* rm/subtree-unwrap-tags (2015-11-24) 1 commit
122
- - contrib/subtree: unwrap tag refs
247
+ Clean up style in an ancient test.
248
124
- Waiting for review from subtree folks.
249
+ Will merge to 'master'.
250
251
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
252
+* ld/p4-detached-head (2015-11-24) 3 commits
253
+ (merged to 'next' on 2015-11-24 at 36ab36a)
254
+ + git-p4: work with a detached head
255
+ + git-p4: add option to system() to return subshell status
256
+ + git-p4: add failing test for submit from detached head
257
133
- Produce correct "dirty" marker for shell prompts, even when we
134
- are on an orphan branch.
258
+ Make git-p4 work on a detached head.
259
136
- Will cook in 'next', then merge to 'master'.
260
+ Will merge to 'master'.
261
262
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
263
+* ls/p4-test-timeouts (2015-11-20) 3 commits
264
+ (merged to 'next' on 2015-11-24 at 905cff8)
265
+ + git-p4: add trap to kill p4d on test exit
266
+ + git-p4: add p4d timeout in tests
267
+ + git-p4: retry kill/cleanup operations in tests with timeout
268
143
- Fix for a corner case in filter-branch.
269
+ Work around some test flakiness with p4d.
270
271
Will merge to 'master'.
272
273
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()
274
+* mg/doc-word-diff-example (2015-11-24) 1 commit
275
+ (merged to 'next' on 2015-11-24 at 5ba28db)
276
+ + Documentation/diff: give --word-diff-regex=. example
277
152
- Allow users of git-sh-setup to handle orphan branch state.
278
+ Will merge to 'master'.
279
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.
280
159
- Will merge to 'next' in a few days.
281
+* mk/blame-first-parent (2015-11-24) 1 commit
282
+ (merged to 'next' on 2015-11-24 at a2ee2a4)
283
+ + blame: fix object casting regression
284
285
+ Regression fix for a topic already in master.
286
162
-* tb/ls-files-eol (2015-11-24) 1 commit
163
- - ls-files: Add eol diagnostics
287
+ Will merge to 'master'.
288
165
- Add options to ls-files to help diagnose end-of-line problems.
289
167
- This latest round hasn't gotten any review yet.
290
+* pt/http-socks-proxy (2015-11-20) 1 commit
291
+ (merged to 'next' on 2015-11-20 at dc6ae48)
292
+ + remote-http(s): support SOCKS proxies
293
169
- Waiting for review.
294
+ Add support for talking http/https over socks proxy.
295
171
---------------------------------------------------
172
-[Graduated to "master"]
296
+ Will merge to 'master'.
297
298
299
+* rs/fsck-nul-header (2015-11-20) 2 commits
300
+ (merged to 'next' on 2015-11-24 at 093b3d6)
301
+ + fsck: treat a NUL in a tag header as an error
302
+ + t1450: add tests for NUL in headers of commits and tags
303
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
304
+ Fsck did not correctly detect a NUL-truncated header in a tag.
305
306
Will merge to 'master'.
307
308
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
309
+* sg/filter-branch-dwim-ambiguity (2015-11-24) 1 commit
310
+ (merged to 'next' on 2015-11-24 at fe596a6)
311
+ + filter-branch: deal with object name vs. pathname ambiguity in tree-filter
312
187
- The "configure" script did not test for -lpthread correctly, which
188
- upset some linkers.
313
+ Fix for a corner case in filter-branch.
314
315
Will merge to 'master'.
316
@@ -256,78 +381,105 @@ But note that I will _not_ be pushing to kernel.org.
381
--------------------------------------------------
382
[Cooking]
383
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
384
+* bb/merge-marker-crlf (2015-11-24) 1 commit
385
+ - merge-file: consider core.crlf when writing merge markers
386
263
- Minor documentation fixup.
387
+ Write out merge markers using system end-of-line convention.
388
265
- Will merge to 'master'.
389
+ Waiting for a re-roll to handle gitattributes.
390
391
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
392
+* dk/gc-more-wo-pack (2015-11-24) 3 commits
393
+ - gc: Clean garbage .bitmap files from pack dir
394
+ - t5304: Add test for .bitmap garbage files
395
+ - prepare_packed_git(): find more garbage
396
274
- Make git-p4 work on a detached head.
397
+ Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
398
+ .bitmap and .keep files.
399
276
- Will merge to 'master'.
400
+ Waiting for review.
401
402
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
403
+* jk/send-email-ssl-errors (2015-11-24) 1 commit
404
+ - send-email: enable SSL level 1 debug output
405
283
- We now consistently allow all hooks to ignore their standard input,
284
- rather than having git complain of SIGPIPE.
406
+ Improve error reporting when SMTP TLS fails.
407
286
- Will merge to 'master'.
408
+ Waiting for re-roll.
409
410
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
411
+* mr/ff-refs (2015-11-28) 6 commits
412
+ - builtin/ff-refs.c: mark some file-local variables static
413
+ - ff-refs: Add tests
414
+ - ff-refs: Add documentation
415
+ - ff-refs: add --dry-run and --skip-worktree options
416
+ - ff-refs: update each updatable ref
417
+ - ff-refs: builtin cmd to check and fast forward local refs to their upstream
418
299
- Test cleanups for the subtree project.
419
+ Specialized command to fast-forward refs to match their upstream.
420
301
- Will merge to 'master'.
421
+ I remain skeptical that this is necessary or sufficient. Comments
422
+ welcome.
423
424
+ Will hold.
425
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
426
308
- Documentation clarification for "check-ignore" without "--verbose".
427
+* ps/rebase-keep-empty (2015-11-24) 2 commits
428
+ - rebase: fix preserving commits with --keep-empty
429
+ - rebase: test broken behavior with --keep-empty
430
310
- Will merge to 'master'.
431
+ Keep duplicate commits via rebase --keep-empty.
432
433
+ I'm not sure if I agree with this interpretation of the "rebase
434
+ --keep-empty" documentation, but I haven't thought too hard about it.
435
+ Comments welcome.
436
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
437
+ Waiting for review.
438
317
- Fix shell quoting in contrib script.
439
319
- Will merge to 'master'.
440
+* rm/subtree-unwrap-tags (2015-11-24) 1 commit
441
+ - contrib/subtree: unwrap tag refs
442
443
+ Waiting for review from subtree folks.
444
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
445
326
- Test portability fix for a topic in v2.6.1.
446
+* sg/bash-prompt-dirty-orphan (2015-11-24) 3 commits
447
+ (merged to 'next' on 2015-11-24 at ac6eb1c)
448
+ + bash prompt: indicate dirty index even on orphan branches
449
+ + bash prompt: remove a redundant 'git diff' option
450
+ + bash prompt: test dirty index and worktree while on an orphan branch
451
+
452
+ Produce correct "dirty" marker for shell prompts, even when we
453
+ are on an orphan branch.
454
455
Will merge to 'master'.
456
457
458
+* sg/sh-require-clean-orphan (2015-11-24) 2 commits
459
+ - sh-setup: make require_clean_work_tree() work on orphan branches
460
+ - Add tests for git-sh-setup's require_clean_work_tree()
461
+
462
+ Allow users of git-sh-setup to handle orphan branch state.
463
+
464
+ This series takes the conservative route of requiring scripts to opt
465
+ into the looser behavior, at the expense of carrying around a new
466
+ option-flag forever. I'm not sure if we need to do so. Comments
467
+ welcome.
468
+
469
+ Waiting for re-roll?
470
+
471
+
472
+* tb/ls-files-eol (2015-11-28) 2 commits
473
+ - convert.c: mark a file-local function static
474
+ - ls-files: Add eol diagnostics
475
+
476
+ Add options to ls-files to help diagnose end-of-line problems.
477
+
478
+ This latest round hasn't gotten any review yet.
479
+
480
+ Waiting for review.
481
+
482
+
483
* ec/annotate-deleted (2015-11-20) 1 commit
484
- annotate: skip checking working tree if a revision is provided
485
@@ -337,16 +489,6 @@ But note that I will _not_ be pushing to kernel.org.
489
Needs review.
490
491
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
-
492
* jk/filter-branch-no-index (2015-11-06) 1 commit
493
(merged to 'next' on 2015-11-24 at e31946e)
494
+ filter-branch: skip index read/write when possible
@@ -354,15 +496,6 @@ But note that I will _not_ be pushing to kernel.org.
496
Speed up filter-branch for cases where we only care about rewriting
497
commits, not tree data.
498
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
-
499
Will merge to 'master'.
500
501
@@ -374,53 +507,18 @@ But note that I will _not_ be pushing to kernel.org.
507
Teach send-email to dump mail aliases, so that we can do tab completion
508
on the command line.
509
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
-
510
Will merge to 'master'.
511
512
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
513
+* ls/test-must-fail-sigpipe (2015-11-28) 2 commits
514
+ (merged to 'next' on 2015-12-01 at d374686)
515
+ + add "ok=sigpipe" to test_must_fail and use it to fix flaky tests
516
+ + implement test_might_fail using a refactored test_must_fail
517
518
Fix some racy client/server tests by treating SIGPIPE the same as a
519
normal non-zero exit.
520
423
- Will hold pending logic cleanups.
521
+ Will merge to 'master' two cycles from now.
522
523
524
* mc/push-recurse-submodules-config (2015-11-20) 1 commit
@@ -432,31 +530,12 @@ But note that I will _not_ be pushing to kernel.org.
530
Waiting for review from submodule folks.
531
532
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
-
533
* np/credential-cache-sighup (2015-11-20) 1 commit
534
(merged to 'next' on 2015-11-24 at 410167f)
535
+ credential-cache: new option to ignore sighup
536
537
Workaround for using credential-cache with emacs.
538
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
-
539
Will merge to 'master'.
540
541
@@ -470,7 +549,7 @@ But note that I will _not_ be pushing to kernel.org.
549
550
Make "-h" command line option work more consistently in all commands.
551
473
- Needs review.
552
+ Will merge to 'master'.
553
554
555
* dt/refs-backend-pre-vtable (2015-11-20) 10 commits
@@ -488,18 +567,19 @@ But note that I will _not_ be pushing to kernel.org.
567
568
Code preparation for pluggable ref backends.
569
491
- Will cook in 'next'.
570
+ Will merge to 'master' two cycles from now.
571
572
573
* 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
574
+ (merged to 'next' on 2015-12-01 at a22bf47)
575
+ + sha1: allow limiting the size of the data passed to SHA1_Update()
576
+ + sha1: provide another level of indirection for the SHA-1 functions
577
578
Apple's common crypto implementation of SHA1_Update() does not take
579
more than 4GB at a time, and we now have a compile-time workaround
580
for it.
581
502
- Will merge to 'next'.
582
+ Will merge to 'master'.
583
584
585
* vl/grep-configurable-threads (2015-11-01) 1 commit
@@ -508,9 +588,9 @@ But note that I will _not_ be pushing to kernel.org.
588
"git grep" can now be configured (or told from the command line)
589
how many threads to use when searching in the working tree files.
590
511
- I haven't reviewed v6 yet. More eyes are welcome.
591
+ There was some review from Eric.
592
513
- Needs review.
593
+ Waiting for re-roll?
594
595
596
* kf/http-proxy-auth-methods (2015-11-04) 3 commits
@@ -526,7 +606,8 @@ But note that I will _not_ be pushing to kernel.org.
606
material in user's keyrings.
607
608
I ejected this from pu for the moment, as it conflicts with the
529
- pt/http-socks-proxy topic.
609
+ pt/http-socks-proxy topic. That is now in master, so it can
610
+ be re-rolled on top.
611
612
Still being worked on.
613
($gmane/280925).
@@ -608,35 +689,15 @@ But note that I will _not_ be pushing to kernel.org.
689
Waiting for reviews.
690
691
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
-
619
- Will merge to 'master'.
620
-
621
-
622
-* ep/ident-with-getaddrinfo (2015-10-30) 1 commit
623
- - (NEEDSWORK $gmane/280507) ident.c: add support for IPv6
692
+* ep/ident-with-getaddrinfo (2015-11-28) 1 commit
693
+ (merged to 'next' on 2015-12-01 at 0775d4c)
694
+ + ident.c: add support for IPv6
695
696
A build without NO_IPv6 used to use gethostbyname() when guessing
697
user's hostname, instead of getaddrinfo() that is used in other
698
codepaths in such a build.
699
629
- Waiting for a reroll.
630
- ($gmane/280507)
631
-
632
-
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
-
639
- Will merge to 'master'.
700
+ Will merge to 'master' two cycles from now.
701
702
703
* mh/notes-allow-reading-treeish (2015-10-08) 3 commits
@@ -711,18 +772,21 @@ But note that I will _not_ be pushing to kernel.org.
772
773
774
* kn/for-each-branch-remainder (2015-10-02) 9 commits
714
- - branch: implement '--format' option
715
- - branch: use ref-filter printing APIs
716
- - ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
717
- - ref-filter: introduce format_ref_array_item()
718
- - ref-filter: adopt get_head_description() from branch.c
719
- - ref-filter: modify "%(objectname:short)" to take length
720
- - ref-filter: add support for %(path) atom
721
- - ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
722
- - ref-filter: implement %(if), %(then), and %(else) atoms
775
+ . branch: implement '--format' option
776
+ . branch: use ref-filter printing APIs
777
+ . ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
778
+ . ref-filter: introduce format_ref_array_item()
779
+ . ref-filter: adopt get_head_description() from branch.c
780
+ . ref-filter: modify "%(objectname:short)" to take length
781
+ . ref-filter: add support for %(path) atom
782
+ . ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
783
+ . ref-filter: implement %(if), %(then), and %(else) atoms
784
785
More unification among "branch -l", "tag -l" and "for-each-ref --format".
786
787
+ Ejected from pu for now, as a re-roll should come on top of
788
+ kn/ref-filter-atom-parsing.
789
+
790
Expecting a reroll.
791
($gmane/278926)
792
@@ -747,7 +811,7 @@ But note that I will _not_ be pushing to kernel.org.
811
812
813
* sb/submodule-parallel-fetch (2015-11-24) 17 commits
750
- . run-command: detect finished children by closed pipe rather than waitpid
814
+ - run-command: detect finished children by closed pipe rather than waitpid
815
(merged to 'next' on 2015-11-20 at 89fc723)
816
+ strbuf: update documentation for strbuf_read_once()
817
+ run-command: remove set_nonblocking()
@@ -772,9 +836,7 @@ But note that I will _not_ be pushing to kernel.org.
836
Add a framework to spawn a group of processes in parallel, and use
837
it to run "git fetch --recurse-submodules" in parallel.
838
775
- Is everybody happy with the topic commit?
776
-
777
- Will cook in 'next'.
839
+ Will merge top commit to 'next'.
840
841
842
* ad/cygwin-wants-rename (2015-08-07) 1 commit