What's cooking (2018/01 #02)
Junio C Hamano committed
Jan 9, 2018 at 15:20 UTC
e0476f2862af4feac7dd0f82fd9013c8f9757ea7
1 file changed
+222
-147
whats-cooking.txt
+222
-147
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jan 2018, #01; Fri, 5)
4
-X-master-at: 36438dc19dd2a305dddebd44bf7a65f1a220075b
5
-X-next-at: 530d649a790d987a1100dafee4f7a635c11cd855
3
+Subject: What's cooking in git.git (Jan 2018, #02; Tue, 9)
4
+X-master-at: 6366dd9000a3f67e47a30d94375a88dabc18ec6f
5
+X-next-at: 55033e839aa0788e7eca704bfa5a1834e6ee1cde
6
7
-What's cooking in git.git (Jan 2018, #01; Fri, 5)
7
+What's cooking in git.git (Jan 2018, #02; Tue, 9)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,11 +12,6 @@ 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
-The tip of 'master' has been tagged as 2.16-rc1; I am aware that a
16
-handful of larger topics are on the list, yet to be picked up, but
17
-now we are pretty much in feature-freeze mode before the release;
18
-please shift your attention to fixes from shiny new toys.
19
-
15
You can find the changes described here in the integration branches
16
of the repositories listed at
17
@@ -25,6 +20,21 @@ of the repositories listed at
20
--------------------------------------------------
21
[Graduated to "master"]
22
23
+* ab/dc-sha1-loose-ends (2017-12-28) 1 commit
24
+ (merged to 'next' on 2018-01-05 at 7186e81793)
25
+ + Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1
26
+
27
+ Tying loose ends for the recent integration work of
28
+ collision-detecting SHA-1 implementation.
29
+
30
+
31
+* bc/submitting-patches-in-asciidoc (2018-01-03) 1 commit
32
+ (merged to 'next' on 2018-01-05 at 92dd960a56)
33
+ + doc/SubmittingPatches: improve text formatting
34
+
35
+ Doc readability update.
36
+
37
+
38
* bp/fsmonitor (2017-12-18) 1 commit
39
(merged to 'next' on 2017-12-27 at ce216e2978)
40
+ p7519: improve check for prerequisite WATCHMAN
@@ -39,6 +49,13 @@ of the repositories listed at
49
Doc updates.
50
51
52
+* bw/protocol-v1 (2018-01-04) 1 commit
53
+ (merged to 'next' on 2018-01-05 at 47a5e0039a)
54
+ + http: fix v1 protocol tests with apache httpd < 2.4
55
+
56
+ Test fix for a topic already in 'master'.
57
+
58
+
59
* cc/skip-to-optional-val (2017-12-11) 7 commits
60
(merged to 'next' on 2017-12-27 at 1b189d8556)
61
+ t4045: reindent to make helpers readable
@@ -60,27 +77,6 @@ of the repositories listed at
77
Doc update.
78
79
63
-* ew/empty-merge-with-dirty-index (2017-12-22) 1 commit
64
- (merged to 'next' on 2017-12-28 at 17aa5ec010)
65
- + Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index
66
- (this branch uses ew/empty-merge-with-dirty-index-maint.)
67
-
68
- "git merge -s recursive" did not correctly abort when the index is
69
- dirty, if the merged tree happened to be the same as the current
70
- HEAD, which has been fixed.
71
-
72
-
73
-* ew/empty-merge-with-dirty-index-maint (2017-12-22) 3 commits
74
- + merge-recursive: avoid incorporating uncommitted changes in a merge
75
- + move index_has_changes() from builtin/am.c to merge.c for reuse
76
- + t6044: recursive can silently incorporate dirty changes in a merge
77
- (this branch is used by ew/empty-merge-with-dirty-index.)
78
-
79
- "git merge -s recursive" did not correctly abort when the index is
80
- dirty, if the merged tree happened to be the same as the current
81
- HEAD, which has been fixed.
82
-
83
-
80
* ew/svn-crlf (2017-12-14) 2 commits
81
(merged to 'next' on 2017-12-27 at 1b81bd634d)
82
+ Merge branch 'svn-crlf' of git://bogomips.org/git-svn into ew/svn-crlf
@@ -122,6 +118,13 @@ of the repositories listed at
118
+ partial-clone: design doc
119
120
121
+* jk/doc-diff-options (2018-01-04) 1 commit
122
+ (merged to 'next' on 2018-01-05 at 11a42ea807)
123
+ + docs/diff-options: clarify scope of diff-filter types
124
+
125
+ Doc update.
126
+
127
+
128
* jk/test-suite-tracing (2017-12-08) 4 commits
129
(merged to 'next' on 2017-12-27 at 7034a51474)
130
+ t/Makefile: introduce TEST_SHELL_PATH
@@ -152,6 +155,14 @@ of the repositories listed at
155
Code cleanup.
156
157
158
+* js/test-with-ws-in-path (2018-01-03) 2 commits
159
+ (merged to 'next' on 2018-01-05 at 6438e1c186)
160
+ + t0302 & t3900: add forgotten quotes
161
+ + Allow the test suite to pass in a directory whose name contains spaces
162
+
163
+ Test fixes.
164
+
165
+
166
* jt/transport-hide-vtable (2017-12-14) 2 commits
167
(merged to 'next' on 2017-12-27 at 8dc27cfb53)
168
+ transport: make transport vtable more private
@@ -222,6 +233,41 @@ of the repositories listed at
233
<commit-ish>:<path> that refers to a given blob object.
234
235
236
+* sg/travis-check-untracked (2018-01-03) 2 commits
237
+ (merged to 'next' on 2018-01-05 at 424bed2fb0)
238
+ + travis-ci: check that all build artifacts are .gitignore-d
239
+ + travis-ci: don't store P4 and Git LFS in the working tree
240
+ (this branch uses sg/travis-fixes and sg/travis-skip-identical-test.)
241
+
242
+ Will cook in 'next'.
243
+
244
+
245
+* sg/travis-fixes (2017-12-27) 4 commits
246
+ (merged to 'next' on 2017-12-28 at 6496308a5b)
247
+ + travis-ci: only print test failures if there are test results available
248
+ + travis-ci: save prove state for the 32 bit Linux build
249
+ + travis-ci: don't install default addon packages for the 32 bit Linux build
250
+ + travis-ci: fine tune the use of 'set -x' in 'ci/*' scripts
251
+ (this branch is used by sg/travis-check-untracked and sg/travis-skip-identical-test.)
252
+
253
+ Assorted updates for TravisCI integration.
254
+
255
+ Will cook in 'next'.
256
+
257
+
258
+* sg/travis-skip-identical-test (2018-01-02) 3 commits
259
+ (merged to 'next' on 2018-01-05 at 41914fc43e)
260
+ + travis-ci: record and skip successfully built trees
261
+ + travis-ci: create the cache directory early in the build process
262
+ + travis-ci: print the "tip of branch is exactly at tag" message in color
263
+ (this branch is used by sg/travis-check-untracked; uses sg/travis-fixes.)
264
+
265
+ Avoid repeatedly testing the same tree in TravisCI that have been
266
+ tested successfully already.
267
+
268
+ Will cook in 'next'.
269
+
270
+
271
* sr/http-sslverify-config-doc (2017-12-18) 1 commit
272
(merged to 'next' on 2017-12-27 at 84a461c4b5)
273
+ config: document default value of http.sslVerify
@@ -252,42 +298,34 @@ of the repositories listed at
298
--------------------------------------------------
299
[New Topics]
300
255
-* ab/dc-sha1-loose-ends (2017-12-28) 1 commit
256
- (merged to 'next' on 2018-01-05 at 7186e81793)
257
- + Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1
258
-
259
- Tying loose ends for the recent integration work of
260
- collision-detecting SHA-1 implementation.
261
-
262
- Will merge to 'master'.
263
-
264
-
301
* ab/wildmatch-tests (2018-01-04) 7 commits
266
- - wildmatch test: create & test files on disk in addition to in-memory
267
- - wildmatch test: perform all tests under all wildmatch() modes
268
- - wildmatch test: remove dead fnmatch() test code
269
- - wildmatch test: use a paranoia pattern from nul_match()
270
- - wildmatch test: don't try to vertically align our output
271
- - wildmatch test: use more standard shell style
272
- - wildmatch test: indent with tabs, not spaces
302
+ (merged to 'next' on 2018-01-09 at 09f0b84098)
303
+ + wildmatch test: create & test files on disk in addition to in-memory
304
+ + wildmatch test: perform all tests under all wildmatch() modes
305
+ + wildmatch test: remove dead fnmatch() test code
306
+ + wildmatch test: use a paranoia pattern from nul_match()
307
+ + wildmatch test: don't try to vertically align our output
308
+ + wildmatch test: use more standard shell style
309
+ + wildmatch test: indent with tabs, not spaces
310
311
More tests for wildmatch functions.
312
276
- Will merge to 'next'.
313
+ Will cook in 'next'.
314
315
316
* cc/codespeed (2018-01-05) 7 commits
280
- - perf/run: read GIT_PERF_REPO_NAME from perf.repoName
281
- - perf/run: learn to send output to codespeed server
282
- - perf/run: learn about perf.codespeedOutput
283
- - perf/run: add conf_opts argument to get_var_from_env_or_config()
284
- - perf/aggregate: implement codespeed JSON output
285
- - perf/aggregate: refactor printing results
286
- - perf/aggregate: fix checking ENV{GIT_PERF_SUBSECTION}
317
+ (merged to 'next' on 2018-01-09 at 5599f7a085)
318
+ + perf/run: read GIT_PERF_REPO_NAME from perf.repoName
319
+ + perf/run: learn to send output to codespeed server
320
+ + perf/run: learn about perf.codespeedOutput
321
+ + perf/run: add conf_opts argument to get_var_from_env_or_config()
322
+ + perf/aggregate: implement codespeed JSON output
323
+ + perf/aggregate: refactor printing results
324
+ + perf/aggregate: fix checking ENV{GIT_PERF_SUBSECTION}
325
326
"perf" test output can be sent to codespeed server.
327
290
- Will merge to 'next'.
328
+ Will cook in 'next'.
329
330
331
* rs/lose-leak-pending (2017-12-28) 9 commits
@@ -308,43 +346,27 @@ of the repositories listed at
346
347
348
* sb/diff-blobfind-pickaxe (2018-01-04) 6 commits
311
- - diff: use HAS_MULTI_BITS instead of counting bits manually
312
- - diff: properly error out when combining multiple pickaxe options
313
- - diffcore: add a pickaxe option to find a specific blob
314
- - diff: introduce DIFF_PICKAXE_KINDS_MASK
315
- - diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bit
316
- - diff.h: make pickaxe_opts an unsigned bit field
349
+ (merged to 'next' on 2018-01-09 at 1c7bace3e7)
350
+ + diff: use HAS_MULTI_BITS instead of counting bits manually
351
+ + diff: properly error out when combining multiple pickaxe options
352
+ + diffcore: add a pickaxe option to find a specific blob
353
+ + diff: introduce DIFF_PICKAXE_KINDS_MASK
354
+ + diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bit
355
+ + diff.h: make pickaxe_opts an unsigned bit field
356
357
"diff" family of commands learned "--find-object=<object-id>" option
358
to limit the findings to changes that involve the named object.
359
321
- Will merge to 'next'.
360
+ Will cook in 'next'.
361
362
363
* ab/perf-grep-threads (2018-01-04) 1 commit
325
- - perf: amend the grep tests to test grep.threads
364
+ (merged to 'next' on 2018-01-09 at 8fe1d71894)
365
+ + perf: amend the grep tests to test grep.threads
366
367
More perf tests for threaded grep
368
329
- Will merge to 'next'.
330
-
331
-
332
-* bc/submitting-patches-in-asciidoc (2018-01-03) 1 commit
333
- (merged to 'next' on 2018-01-05 at 92dd960a56)
334
- + doc/SubmittingPatches: improve text formatting
335
-
336
- Doc readability update.
337
-
338
- Will merge to 'master'.
339
-
340
-
341
-* bw/protocol-v1 (2018-01-04) 1 commit
342
- (merged to 'next' on 2018-01-05 at 47a5e0039a)
343
- + http: fix v1 protocol tests with apache httpd < 2.4
344
-
345
- Test fix for a topic already in 'master'.
346
-
347
- Will merge to 'master'.
369
+ Will cook in 'next'.
370
371
372
* bw/protocol-v2 (2018-01-04) 26 commits
@@ -375,6 +397,8 @@ of the repositories listed at
397
- pkt-line: introduce struct packet_reader
398
- pkt-line: introduce packet_read_with_status
399
400
+ The beginning of the next-gen transfer protocol.
401
+
402
403
* jh/status-no-ahead-behind (2018-01-04) 4 commits
404
- status: support --no-ahead-behind in long format
@@ -382,40 +406,30 @@ of the repositories listed at
406
- status: add --[no-]ahead-behind to status and commit for V2 format.
407
- stat_tracking_info: return +1 when branches not equal
408
385
-
386
-* jk/abort-clone-with-existing-dest (2018-01-03) 4 commits
387
- - clone: do not clean up directories we didn't create
388
- - clone: factor out dir_exists() helper
389
- - t5600: modernize style
390
- - t5600: fix outdated comment about unborn HEAD
391
-
392
-
393
-* jk/doc-diff-options (2018-01-04) 1 commit
394
- (merged to 'next' on 2018-01-05 at 11a42ea807)
395
- + docs/diff-options: clarify scope of diff-filter types
396
-
397
- Doc update.
398
-
399
- Will merge to 'master'.
409
+ Still in flux.
410
411
402
-* js/test-with-ws-in-path (2018-01-03) 2 commits
403
- (merged to 'next' on 2018-01-05 at 6438e1c186)
404
- + t0302 & t3900: add forgotten quotes
405
- + Allow the test suite to pass in a directory whose name contains spaces
412
+* jk/abort-clone-with-existing-dest (2018-01-03) 4 commits
413
+ (merged to 'next' on 2018-01-09 at 789a55a9e1)
414
+ + clone: do not clean up directories we didn't create
415
+ + clone: factor out dir_exists() helper
416
+ + t5600: modernize style
417
+ + t5600: fix outdated comment about unborn HEAD
418
407
- Test fixes.
419
+ "git clone $there $here" is allowed even when here directory exists
420
+ as long as it is an empty directory, but the command incorrectly
421
+ removed it upon a failure of the operation.
422
409
- Will merge to 'master'.
423
+ Will cook in 'next'.
424
425
412
-* ls/checkout-encoding (2018-01-04) 6 commits
413
- - utf8.c: mark utf{16,32}_{be,le}_bom symbols static
426
+* ls/checkout-encoding (2018-01-08) 6 commits
427
- convert: add support for 'checkout-encoding' attribute
428
+ - convert_to_git(): safe_crlf/checksafe becomes int conv_flags
429
- utf8: add function to detect a missing UTF-16/32 BOM
430
- utf8: add function to detect prohibited UTF-16/32 BOM
431
- strbuf: add xstrdup_toupper()
418
- - convert_to_git(): checksafe becomes an integer
432
+ - strbuf: remove unnecessary NUL assignment in xstrdup_tolower()
433
434
The new "checkout-encoding" attribute can ask Git to convert the
435
contents to the specified encoding when checking out to the working
@@ -423,20 +437,25 @@ of the repositories listed at
437
438
439
* ma/bisect-leakfix (2018-01-03) 1 commit
426
- - bisect: fix a regression causing a segfault
440
+ (merged to 'next' on 2018-01-09 at af04bd5436)
441
+ + bisect: fix a regression causing a segfault
442
428
- Will merge to 'next'.
443
+ A hotfix for a recent update that broke 'git bisect'.
444
+
445
+ Will merge to 'master'.
446
447
431
-* mm/send-email-fallback-to-local-mail-address (2018-01-05) 3 commits
448
+* mm/send-email-fallback-to-local-mail-address (2018-01-08) 3 commits
449
- send-email: add test for Linux's get_maintainer.pl
433
- - Remove now useless email-address parsing code
450
+ - perl/Git: remove now useless email-address parsing code
451
- send-email: add and use a local copy of Mail::Address
452
453
Instead of maintaining home-grown email address parsing code, ship
454
a copy of reasonably recent Mail::Address to be used as a fallback
455
in 'git send-email' when the platform lacks it.
456
457
+ Will merge to 'next'.
458
+
459
460
* sb/submodule-update-reset-fix (2018-01-05) 4 commits
461
- submodule: submodule_move_head omits old argument in forced case
@@ -447,23 +466,74 @@ of the repositories listed at
466
When resetting the working tree files recursively, the working tree
467
of submodules are now also reset to match.
468
450
-
451
-* sg/travis-check-untracked (2018-01-03) 2 commits
452
- (merged to 'next' on 2018-01-05 at 424bed2fb0)
453
- + travis-ci: check that all build artifacts are .gitignore-d
454
- + travis-ci: don't store P4 and Git LFS in the working tree
455
- (this branch uses sg/travis-fixes and sg/travis-skip-identical-test.)
456
-
457
- Will merge to 'master'.
469
+ Will merge to 'next'.
470
471
472
* js/fix-merge-arg-quoting-in-rebase-p (2018-01-05) 1 commit
461
- - rebase -p: fix quoting when calling `git merge`
473
+ (merged to 'next' on 2018-01-09 at 57950f1843)
474
+ + rebase -p: fix quoting when calling `git merge`
475
476
"git rebase -p -X<option>" did not propagate the option properly
477
down to underlying merge strategy backend.
478
466
- Will merge to 'next' and then to 'master'.
479
+ Will merge to 'master'.
480
+
481
+
482
+* as/read-tree-prefix-doc-fix (2018-01-09) 1 commit
483
+ - doc/read-tree: remove obsolete remark
484
+
485
+ Doc update.
486
+
487
+ Will merge to 'next'.
488
+
489
+
490
+* jh/object-filtering (2018-01-08) 1 commit
491
+ - oidset: don't return value from oidset_init
492
+
493
+ Hotfix for a topic already in 'master'.
494
+
495
+ Will merge to 'next'.
496
+
497
+
498
+* pc/submodule-helper (2018-01-09) 2 commits
499
+ - submodule: port submodule subcommand 'deinit' from shell to C
500
+ - submodule: port submodule subcommand 'sync' from shell to C
501
+
502
+ Rewrite two more "git submodule" subcommands in C.
503
+
504
+ Will segfault.
505
+ cf. <xmqqpo6i4uns.fsf@gitster.mtv.corp.google.com>
506
+
507
+
508
+* sb/blame-color (2018-01-08) 4 commits
509
+ - builtin/blame: highlight recently changed lines
510
+ - builtin/blame: add option to color metadata fields separately
511
+ - builtin/blame: dim uninteresting metadata
512
+ - color.h: document and modernize header
513
+
514
+
515
+* sg/travis-build-during-script-phase (2018-01-08) 1 commit
516
+ - travis-ci: build Git during the 'script' phase
517
+
518
+ Still under discussion.
519
+ cf. <5DE3FA05-2347-4BE7-8A1A-A6E5FEEC7C2B@gmail.com>
520
+
521
+
522
+* tg/stash-with-pathspec-fix (2018-01-08) 1 commit
523
+ - stash: don't delete untracked files that match pathspec
524
+
525
+ "git stash -- <pathspec>" incorrectly blew away untracked files in
526
+ the directory that matched the pathspec, which has been corrected.
527
+
528
+ Will merge to 'next'.
529
+
530
+
531
+* ys/bisect-object-id-missing-conversion-fix (2018-01-09) 1 commit
532
+ - bisect: debug: convert struct object to object_id
533
+
534
+ Fix for a commented-out code to adjust it to a rather old API change.
535
+
536
+ Will merge to 'next'.
537
538
--------------------------------------------------
539
[Stalled]
@@ -608,6 +678,29 @@ of the repositories listed at
678
--------------------------------------------------
679
[Cooking]
680
681
+* ew/empty-merge-with-dirty-index (2018-01-09) 1 commit
682
+ (merged to 'next' on 2018-01-09 at 851bc45d06)
683
+ + Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index
684
+ (this branch uses ew/empty-merge-with-dirty-index-maint.)
685
+
686
+ "git merge -s recursive" did not correctly abort when the index is
687
+ dirty, if the merged tree happened to be the same as the current
688
+ HEAD, which has been fixed.
689
+
690
+ Will merge to 'master'.
691
+
692
+
693
+* ew/empty-merge-with-dirty-index-maint (2018-01-09) 1 commit
694
+ + merge-recursive: do not look at the index during recursive merge
695
+ (this branch is used by ew/empty-merge-with-dirty-index.)
696
+
697
+ "git merge -s recursive" did not correctly abort when the index is
698
+ dirty, if the merged tree happened to be the same as the current
699
+ HEAD, which has been fixed.
700
+
701
+ Will merge to 'master' (as part of the above).
702
+
703
+
704
* jc/merge-symlink-ours-theirs (2018-01-03) 1 commit
705
(merged to 'next' on 2018-01-05 at 63ebfc45eb)
706
+ merge: teach -Xours/-Xtheirs to symbolic link merge
@@ -626,10 +719,16 @@ of the repositories listed at
719
at the same time; allow it to annotate resulting commit with more
720
text.
721
722
+ Will merge to 'next'.
723
+
724
725
* bw/oidmap-autoinit (2017-12-27) 1 commit
726
- oidmap: ensure map is initialized
727
728
+ Code clean-up.
729
+
730
+ Will merge to 'next'.
731
+
732
733
* dk/describe-all-output-fix (2017-12-27) 1 commit
734
(merged to 'next' on 2017-12-28 at c6254494e3)
@@ -650,6 +749,8 @@ of the repositories listed at
749
750
Some bugs around "untracked cache" feature have been fixed.
751
752
+ Will merge to 'next'.
753
+
754
755
* nd/ita-wt-renames-in-status (2017-12-27) 6 commits
756
(merged to 'next' on 2017-12-28 at 7610331a11)
@@ -668,19 +769,6 @@ of the repositories listed at
769
Will cook in 'next'.
770
771
671
-* sg/travis-skip-identical-test (2018-01-02) 3 commits
672
- (merged to 'next' on 2018-01-05 at 41914fc43e)
673
- + travis-ci: record and skip successfully built trees
674
- + travis-ci: create the cache directory early in the build process
675
- + travis-ci: print the "tip of branch is exactly at tag" message in color
676
- (this branch is used by sg/travis-check-untracked; uses sg/travis-fixes.)
677
-
678
- Avoid repeatedly testing the same tree in TravisCI that have been
679
- tested successfully already.
680
-
681
- Will merge to 'master'.
682
-
683
-
772
* np/send-email-header-parsing (2017-12-15) 1 commit
773
- send-email: extract email-parsing code into a subroutine
774
@@ -704,19 +792,6 @@ of the repositories listed at
792
cf. <alpine.DEB.2.21.1.1801042335130.32@MININT-6BKU6QN.europe.corp.microsoft.com>
793
794
707
-* sg/travis-fixes (2017-12-27) 4 commits
708
- (merged to 'next' on 2017-12-28 at 6496308a5b)
709
- + travis-ci: only print test failures if there are test results available
710
- + travis-ci: save prove state for the 32 bit Linux build
711
- + travis-ci: don't install default addon packages for the 32 bit Linux build
712
- + travis-ci: fine tune the use of 'set -x' in 'ci/*' scripts
713
- (this branch is used by sg/travis-check-untracked and sg/travis-skip-identical-test.)
714
-
715
- Assorted updates for TravisCI integration.
716
-
717
- Will merge to 'master'.
718
-
719
-
795
* ab/sha1dc-build (2017-12-12) 4 commits
796
- Makefile: use the sha1collisiondetection submodule by default
797
- sha1dc_git.h: re-arrange an ifdef chain for a subsequent change