What's cooking (2017/08 #03)
Junio C Hamano committed
Aug 14, 2017 at 16:51 UTC
c253fabf9b2873c4098c43365392fe5bb519fd91
1 file changed
+128
-77
whats-cooking.txt
+128
-77
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Aug 2017, #02; Fri, 11)
3
+Subject: What's cooking in git.git (Aug 2017, #03; Mon, 14)
4
X-master-at: b3622a4ee94e4916cd05e6d96e41eeb36b941182
5
-X-next-at: b18f417b8938ccf4d9dfc9a6ecca90dcaa2868f7
5
+X-next-at: 24db08a6e8fed761d3bace7f2d5997806e20b9f7
6
7
-What's cooking in git.git (Aug 2017, #02; Fri, 11)
7
+What's cooking in git.git (Aug 2017, #03; Mon, 14)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,13 +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 first batch of 32 topics (not counting the v2.14.1 update which
16
-was a security fix), which are the ones that have been cooking in
17
-'next' during the pre-release freeze period, have now been merged to
18
-'master'. I have not really started pickng up new topics posted to
19
-the list yet and yet to rewind and rebuild the 'next' branch to
20
-start a new cycle. Hopefully it can happen early next week.
21
-
15
The top part of the draft release notes for the next cycle, which I
16
tentatively called Git 2.15, declares that "git add ''" will still
17
be supported up to this release but will become illegal after that.
@@ -387,6 +380,14 @@ of the repositories listed at
380
--------------------------------------------------
381
[New Topics]
382
383
+* ks/prepare-commit-msg-sample-fix (2017-08-14) 1 commit
384
+ - hook: use correct logical variable
385
+
386
+ An "oops" fix to a topic that is already in 'master'.
387
+
388
+ Will merge to 'next'.
389
+
390
+
391
* ab/ref-filter-no-contains (2017-08-07) 1 commit
392
- tests: don't give unportable ">" to "test" built-in, use -gt
393
@@ -427,7 +428,7 @@ of the repositories listed at
428
Will merge to 'next'.
429
430
430
-* rs/freebsd-getcwd-workaround (2017-08-07) 1 commit
431
+* rs/obsd-getcwd-workaround (2017-08-07) 1 commit
432
- t0001: skip test with restrictive permissions if getpwd(3) respects them
433
434
Test portability fix for BSDs.
@@ -460,11 +461,22 @@ of the repositories listed at
461
462
463
* jk/drop-ancient-curl (2017-08-09) 5 commits
463
- . http: #error on too-old curl
464
- . curl: remove ifdef'd code never used with curl >=7.19.4
465
- . http: drop support for curl < 7.19.4
466
- . http: drop support for curl < 7.16.0
467
- . http: drop support for curl < 7.11.1
464
+ - http: #error on too-old curl
465
+ - curl: remove ifdef'd code never used with curl >=7.19.4
466
+ - http: drop support for curl < 7.19.4
467
+ - http: drop support for curl < 7.16.0
468
+ - http: drop support for curl < 7.11.1
469
+
470
+
471
+* tc/curl-with-backports (2017-08-11) 2 commits
472
+ - http: use a feature check to enable GSSAPI delegation control
473
+ - http: fix handling of missing CURLPROTO_*
474
+
475
+ Updates to the HTTP layer we made recently unconditionally used
476
+ features of libCurl without checking the existence of them, causing
477
+ compilation errors, which has been fixed. Also migrate the code to
478
+ check feature macros, not version numbers, to cope better with
479
+ libCurl that vendor ships with backported features.
480
481
482
* jk/drop-sha1-entry-pos (2017-08-09) 1 commit
@@ -490,6 +502,12 @@ of the repositories listed at
502
- interpret-trailers: add an option to show only the trailers
503
- trailer: put process_trailers() options into a struct
504
505
+ "git interpret-trailers" has been taught a "--parse" and a few
506
+ other options to make it easier for scripts to grab existing
507
+ trailer lines from a commit log message.
508
+
509
+ Will merge to 'next'.
510
+
511
512
* mk/use-size-t-in-zlib (2017-08-10) 1 commit
513
- zlib.c: use size_t for size
@@ -498,7 +516,10 @@ of the repositories listed at
516
"unsigned long" for sizes of regions in memory, which have been
517
updated to use "size_t".
518
501
- Will merge to 'next'.
519
+ Needs review.
520
+
521
+ There were some concerns raised around s/off_t/size_t/ in this
522
+ change.
523
524
525
* pw/am-signoff (2017-08-08) 1 commit
@@ -612,7 +633,7 @@ of the repositories listed at
633
Will merge to 'next'.
634
635
615
-* kw/rebase-progress (2017-08-11) 2 commits
636
+* kw/rebase-progress (2017-08-14) 2 commits
637
- rebase: turn on progress option by default for format-patch
638
- format-patch: have progress option while generating patches
639
@@ -622,9 +643,7 @@ of the repositories listed at
643
long time preparing these many changes to replay (which would give
644
the user a chance to abort with ^C).
645
625
- Waiting for a response.
626
- cf. <20170810232033.46ujnozvnodkguog@sigill.intra.peff.net>
627
- cf. <xmqqshgxycal.fsf@gitster.mtv.corp.google.com>
646
+ Will merge to 'next'.
647
648
649
* mk/diff-delta-avoid-large-offset (2017-08-11) 1 commit
@@ -649,15 +668,56 @@ of the repositories listed at
668
Will merge to 'next'.
669
670
652
-* tc/curl-with-backports (2017-08-11) 2 commits
653
- - http: use a feature check to enable GSSAPI delegation control
654
- - http: fix handling of missing CURLPROTO_*
671
+* rs/object-id (2017-08-14) 1 commit
672
+ - tree-walk: convert fill_tree_descriptor() to object_id
673
656
- Updates to the HTTP layer we made recently unconditionally used
657
- features of libCurl without checking the existence of them, causing
658
- compilation errors, which has been fixed. Also migrate the code to
659
- check feature macros, not version numbers, to cope better with
660
- libCurl that vendor ships with backported features.
674
+ Conversion from uchar[20] to struct object_id continues.
675
+
676
+ Will merge to 'next'.
677
+
678
+
679
+* ah/doc-empty-string-is-false (2017-08-14) 1 commit
680
+ - doc: clarify "config --bool" behaviour with empty string
681
+
682
+ Doc update.
683
+
684
+ Will merge to 'next'.
685
+
686
+
687
+* jt/diff-color-move-fix (2017-08-14) 3 commits
688
+ - diff: check MIN_BLOCK_LENGTH at start of new block
689
+ - diff: respect MIN_BLOCK_LENGTH for last block
690
+ - diff: avoid redundantly clearing a flag
691
+ (this branch uses sb/diff-color-move.)
692
+
693
+ A handful of bugfixes to "diff --color-moved".
694
+
695
+
696
+* kd/stash-with-bash-4.4 (2017-08-14) 1 commit
697
+ - stash: prevent warning about null bytes in input
698
+
699
+ bash 4.4 or newer gave a warning on NUL byte in command
700
+ substitution done in "git stash"; this has been squelched.
701
+
702
+ Will merge to 'next'.
703
+
704
+
705
+* kw/commit-keep-index-when-pre-commit-is-not-run (2017-08-14) 1 commit
706
+ - commit: skip discarding the index if there is no pre-commit hook
707
+
708
+ "git commit" used to discard the index and re-read from the filesystem
709
+ just in case the pre-commit hook has updated it in the middle; this
710
+ has been optimized out when we know we do not run the pre-commit hook.
711
+
712
+ Will merge to 'next'.
713
+
714
+
715
+* bw/git-clang-format (2017-08-14) 2 commits
716
+ - Makefile: add style build rule
717
+ - clang-format: outline the git project's coding style
718
+
719
+ "make style" runs git-clang-format to help developers by pointing
720
+ out coding style issues.
721
722
--------------------------------------------------
723
[Stalled]
@@ -738,7 +798,7 @@ of the repositories listed at
798
[Cooking]
799
800
* pw/sequence-rerere-autoupdate (2017-08-02) 6 commits
741
- (merged to 'next' on 2017-08-11 at cd2d165be2)
801
+ (merged to 'next' on 2017-08-14 at 010cbb0cbe)
802
+ cherry-pick/revert: reject --rerere-autoupdate when continuing
803
+ cherry-pick/revert: remember --rerere-autoupdate
804
+ t3504: use test_commit
@@ -754,7 +814,7 @@ of the repositories listed at
814
815
816
* bw/clone-recursive-quiet (2017-08-04) 1 commit
757
- (merged to 'next' on 2017-08-11 at f49ac463f7)
817
+ (merged to 'next' on 2017-08-14 at fbd4473ce4)
818
+ clone: teach recursive clones to respect -q
819
820
"git clone --recurse-submodules --quiet" did not pass the quiet
@@ -770,8 +830,8 @@ of the repositories listed at
830
trailer with the committer's name.
831
832
773
-* pb/trailers-from-command-line (2017-07-25) 4 commits
774
- - SQUASH???
833
+* pb/trailers-from-command-line (2017-08-14) 4 commits
834
+ - interpret-trailers: fix documentation typo
835
- interpret-trailers: add options for actions
836
- trailers: introduce struct new_trailer_item
837
- trailers: export action enums and corresponding lookup functions
@@ -779,8 +839,6 @@ of the repositories listed at
839
"git interpret-trailers" learned to take the trailer specifications
840
from the command line that overrides the configured values.
841
782
- Expecting a reroll for compilation fix.
783
-
842
843
* sb/submodule-recursive-checkout-detach-head (2017-07-28) 2 commits
844
- Documentation/checkout: clarify submodule HEADs to be detached
@@ -797,8 +855,7 @@ of the repositories listed at
855
856
857
* ti/external-sha1dc (2017-07-25) 1 commit
800
- (merged to 'next' on 2017-07-27 at d1ce394fe2)
801
- + hash: allow building with the external sha1dc library
858
+ - hash: allow building with the external sha1dc library
859
860
Platforms that ship with a separate sha1 with collision detection
861
library can link to it instead of using the copy we ship as part of
@@ -833,7 +890,7 @@ of the repositories listed at
890
891
892
* bw/push-options-recursively-to-submodules (2017-07-20) 1 commit
836
- (merged to 'next' on 2017-07-27 at 26b3af2544)
893
+ (merged to 'next' on 2017-08-14 at 421dc09fd0)
894
+ submodule--helper: teach push-check to handle HEAD
895
896
"git push --recurse-submodules $there HEAD:$target" was not
@@ -850,7 +907,7 @@ of the repositories listed at
907
908
909
* bw/grep-recurse-submodules (2017-08-02) 10 commits
853
- (merged to 'next' on 2017-08-04 at 4e60c34bad)
910
+ (merged to 'next' on 2017-08-14 at dcfcfc94af)
911
+ grep: recurse in-process using 'struct repository'
912
+ submodule: merge repo_read_gitmodules and gitmodules_config
913
+ submodule: check for unmerged .gitmodules outside of config parsing
@@ -898,7 +955,7 @@ of the repositories listed at
955
956
957
* ex/deprecate-empty-pathspec-as-match-all (2017-06-23) 2 commits
901
- (merged to 'next' on 2017-06-26 at d026281517)
958
+ (merged to 'next' on 2017-08-14 at 24db08a6e8)
959
+ pathspec: die on empty strings as pathspec
960
+ t0027: do not use an empty string as a pathspec element
961
@@ -914,9 +971,8 @@ of the repositories listed at
971
972
973
* mh/packed-ref-store (2017-07-27) 31 commits
917
- (merged to 'next' on 2017-07-27 at 857dcb8cba)
974
+ (merged to 'next' on 2017-08-14 at 987b76d302)
975
+ packed_ref_store: handle a packed-refs file that is a symlink
919
- (merged to 'next' on 2017-07-05 at 6c68c603cc)
976
+ read_packed_refs(): die if `packed-refs` contains bogus data
977
+ t3210: add some tests of bogus packed-refs file contents
978
+ repack_without_refs(): don't lock or unlock the packed refs
@@ -954,16 +1010,13 @@ of the repositories listed at
1010
1011
1012
* sd/branch-copy (2017-06-18) 3 commits
957
- (merged to 'next' on 2017-07-18 at 5e3b9357ea)
958
- + branch: add a --copy (-c) option to go with --move (-m)
959
- + branch: add test for -m renaming multiple config sections
960
- + config: create a function to format section headers
1013
+ - branch: add a --copy (-c) option to go with --move (-m)
1014
+ - branch: add test for -m renaming multiple config sections
1015
+ - config: create a function to format section headers
1016
1017
"git branch" learned "-c/-C" to create and switch to a new branch
1018
by copying an existing one.
1019
965
- Will merge to 'master'.
966
-
1020
I personally do not think "branch --copy master backup" while on
1021
"master" that switches to "backup" is a good UI, and I *will* say
1022
"I told you so" when users complain after we merge this down to
@@ -971,40 +1024,38 @@ of the repositories listed at
1024
1025
1026
* sb/diff-color-move (2017-06-30) 26 commits
974
- (merged to 'next' on 2017-07-06 at 758ed40e4f)
975
- + diff: document the new --color-moved setting
976
- + diff.c: add dimming to moved line detection
977
- + diff.c: color moved lines differently, plain mode
978
- + diff.c: color moved lines differently
979
- + diff.c: buffer all output if asked to
980
- + diff.c: emit_diff_symbol learns about DIFF_SYMBOL_SUMMARY
981
- + diff.c: emit_diff_symbol learns about DIFF_SYMBOL_STAT_SEP
982
- + diff.c: convert word diffing to use emit_diff_symbol
983
- + diff.c: convert show_stats to use emit_diff_symbol
984
- + diff.c: convert emit_binary_diff_body to use emit_diff_symbol
985
- + submodule.c: migrate diff output to use emit_diff_symbol
986
- + diff.c: emit_diff_symbol learns DIFF_SYMBOL_REWRITE_DIFF
987
- + diff.c: emit_diff_symbol learns about DIFF_SYMBOL_BINARY_FILES
988
- + diff.c: emit_diff_symbol learns DIFF_SYMBOL_HEADER
989
- + diff.c: emit_diff_symbol learns DIFF_SYMBOL_FILEPAIR_{PLUS, MINUS}
990
- + diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_INCOMPLETE
991
- + diff.c: emit_diff_symbol learns DIFF_SYMBOL_WORDS[_PORCELAIN]
992
- + diff.c: migrate emit_line_checked to use emit_diff_symbol
993
- + diff.c: emit_diff_symbol learns DIFF_SYMBOL_NO_LF_EOF
994
- + diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_FRAGINFO
995
- + diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_MARKER
996
- + diff.c: introduce emit_diff_symbol
997
- + diff.c: factor out diff_flush_patch_all_file_pairs
998
- + diff.c: move line ending check into emit_hunk_header
999
- + diff.c: readability fix
1000
- + Merge branch 'sb/hashmap-customize-comparison' into sb/diff-color-move
1027
+ - diff: document the new --color-moved setting
1028
+ - diff.c: add dimming to moved line detection
1029
+ - diff.c: color moved lines differently, plain mode
1030
+ - diff.c: color moved lines differently
1031
+ - diff.c: buffer all output if asked to
1032
+ - diff.c: emit_diff_symbol learns about DIFF_SYMBOL_SUMMARY
1033
+ - diff.c: emit_diff_symbol learns about DIFF_SYMBOL_STAT_SEP
1034
+ - diff.c: convert word diffing to use emit_diff_symbol
1035
+ - diff.c: convert show_stats to use emit_diff_symbol
1036
+ - diff.c: convert emit_binary_diff_body to use emit_diff_symbol
1037
+ - submodule.c: migrate diff output to use emit_diff_symbol
1038
+ - diff.c: emit_diff_symbol learns DIFF_SYMBOL_REWRITE_DIFF
1039
+ - diff.c: emit_diff_symbol learns about DIFF_SYMBOL_BINARY_FILES
1040
+ - diff.c: emit_diff_symbol learns DIFF_SYMBOL_HEADER
1041
+ - diff.c: emit_diff_symbol learns DIFF_SYMBOL_FILEPAIR_{PLUS, MINUS}
1042
+ - diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_INCOMPLETE
1043
+ - diff.c: emit_diff_symbol learns DIFF_SYMBOL_WORDS[_PORCELAIN]
1044
+ - diff.c: migrate emit_line_checked to use emit_diff_symbol
1045
+ - diff.c: emit_diff_symbol learns DIFF_SYMBOL_NO_LF_EOF
1046
+ - diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_FRAGINFO
1047
+ - diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_MARKER
1048
+ - diff.c: introduce emit_diff_symbol
1049
+ - diff.c: factor out diff_flush_patch_all_file_pairs
1050
+ - diff.c: move line ending check into emit_hunk_header
1051
+ - diff.c: readability fix
1052
+ - Merge branch 'sb/hashmap-customize-comparison' into sb/diff-color-move
1053
+ (this branch is used by jt/diff-color-move-fix.)
1054
1055
"git diff" has been taught to optionally paint new lines that are
1056
the same as deleted lines elsewhere differently from genuinely new
1057
lines.
1058
1006
- Will merge to 'master'.
1007
-
1059
--------------------------------------------------
1060
[Discarded]
1061