What's cooking (2019/07 #01)
Junio C Hamano committed
Jul 3, 2019 at 15:26 UTC
5e0888deb965b9e87bd7d0702d3eb4f71a1cb7e7
1 file changed
+205
-105
whats-cooking.txt
+205
-105
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2019, #07; Fri, 28)
3
+Subject: What's cooking in git.git (Jul 2019, #01; Wed, 3)
4
X-master-at: 8dca754b1e874719a732bc9ab7b0e14b21b1bc10
5
-X-next-at: 81fc6c5d4a7fb145529da1dfc407c4e0c0e8ae8e
5
+X-next-at: 7e3185f69d3a7787a33c0a87c34e609ef9958fe8
6
7
-What's cooking in git.git (Jun 2019, #07; Fri, 28)
7
+What's cooking in git.git (Jul 2019, #01; Wed, 3)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -23,104 +23,84 @@ of the repositories listed at
23
--------------------------------------------------
24
[New Topics]
25
26
-* cb/windows-manifest (2019-06-27) 1 commit
27
- - mingw: embed a manifest to trick UAC into Doing The Right Thing
28
-
29
- Windows update.
30
-
31
- Will merge to 'next'.
32
-
33
-
34
-* js/mingw-gcc-stash-protect (2019-06-27) 1 commit
35
- - mingw: enable stack smashing protector
36
-
37
- Windows update.
26
+* bc/hash-independent-tests-part-4 (2019-07-01) 10 commits
27
+ - t2203: avoid hard-coded object ID values
28
+ - t1710: make hash independent
29
+ - t1007: remove SHA1 prerequisites
30
+ - t0090: make test pass with SHA-256
31
+ - t0027: make hash size independent
32
+ - t6030: make test work with SHA-256
33
+ - t5000: make hash independent
34
+ - t1450: make hash size independent
35
+ - t1410: make hash size independent
36
+ - t: add helper to convert object IDs to paths
37
39
- Will merge to 'next'.
38
+ Update to the tests to help SHA-256 transition continues.
39
40
42
-* js/mingw-use-utf8 (2019-06-27) 2 commits
43
- - mingw: use Unicode functions explicitly
44
- - mingw: get pw_name in UTF-8 format
41
+* pw/prompt-cherry-pick-revert-fix (2019-07-01) 1 commit
42
+ - git-prompt: improve cherry-pick/revert detection
43
46
- Windows update.
44
+ When one step in multi step cherry-pick or revert is reset or
45
+ committed, the command line prompt script failed to notice the
46
+ current status, which has been improved.
47
48
Will merge to 'next'.
49
50
51
-* kb/windows-force-utf8 (2019-06-27) 1 commit
52
- - gettext: always use UTF-8 on native Windows
51
+* pw/rebase-progress-test-cleanup (2019-07-01) 1 commit
52
+ - t3420: remove progress lines before comparing output
53
+ (this branch uses sg/rebase-progress.)
54
54
- Windows update.
55
+ Test cleanup.
56
57
Will merge to 'next'.
58
59
59
-* js/rebase-reschedule-applies-only-to-interactive (2019-06-27) 1 commit
60
- - rebase: ignore rebase.reschedulefailedexec unless interactive
60
+* sg/git-C-empty-doc (2019-07-01) 1 commit
61
+ - Document that 'git -C ""' works and doesn't change directory
62
62
- The configuration variable rebase.rescheduleFailedExec should be
63
- effective only while running an interactive rebase and should not
64
- affect anything when running an non-interactive one, which was not
65
- the case. This has been corrected.
66
-
67
- Almost there, modulo minor nits.
68
-
69
-
70
-
71
-* jt/t5551-test-chunked (2019-06-27) 1 commit
72
- - t5551: test usage of chunked encoding explicitly
73
-
74
- Update smart-http test.
63
+ Doc update.
64
65
Will merge to 'next'.
66
67
79
-* tb/ref-filter-multiple-patterns (2019-06-27) 1 commit
80
- - ref-filter.c: find disjoint pattern prefixes
81
-
82
- "git for-each-ref" with multiple patterns have been optimized.
83
-
84
- Will merge to 'next'.
85
-
68
+* es/local-atomic-push-failure-with-http (2019-07-02) 2 commits
69
+ - SQUASH???
70
+ - transport-helper: enforce atomic in push_refs_with_push
71
87
-* ew/repack-with-bitmaps-by-default (2019-06-28) 1 commit
88
- - repack: disable bitmaps-by-default if .keep files exist
72
+ "git push --atomic" that goes over the transport-helper (namely,
73
+ the smart http transport) failed to prevent refs to be pushed when
74
+ it can locally tell that one of the ref update will fail without
75
+ having to consult the other end, which has been corrected.
76
90
- Generation of pack bitmaps are now disabled when .keep files exist,
91
- as these are mutually exclusive features.
77
+ Need to either wait for reroll or squash the fix in directly.
78
79
94
-* jk/br-blame-ignore-unused-fix (2019-06-28) 1 commit
95
- - blame: drop some unused function parameters
96
- (this branch uses br/blame-ignore.)
80
+* es/walken-tutorial (2019-07-02) 1 commit
81
+ - documentation: add tutorial for revision walking
82
98
- Move this into the base topic, once acked.
83
+ Yet another revision walker tutorial.
84
85
101
-* jk/check-connected-with-alternates (2019-06-28) 1 commit
102
- - check_connected: assume alternate ref tips are valid
86
+* qn/clone-doc-use-long-form (2019-07-02) 2 commits
87
+ - docs: git-clone: list short form of options first
88
+ - docs: git-clone: refer to long form of options
89
104
- The tips of refs from the alternate object store can be used as
105
- starting point for reachability computation now.
90
+ The "git clone" documentation refers to command line options in its
91
+ description in the short form; they have been replaced with long
92
+ forms to make them more recognisable.
93
94
Will merge to 'next'.
95
96
110
-* jk/test-commit-bulk (2019-06-28) 6 commits
111
- - t6200: use test_commit_bulk
112
- - t5703: use test_commit_bulk
113
- - t5702: use test_commit_bulk
114
- - t3311: use test_commit_bulk
115
- - t5310: increase the number of bitmapped commits
116
- - test-lib: introduce test_commit_bulk
97
+* sg/ci-brew-gcc-workaround (2019-07-03) 2 commits
98
+ - ci: disable Homebrew's auto cleanup
99
+ - ci: don't update Homebrew
100
118
- A test helper has been introduced to optimize preparation of test
119
- repositories with many simple commits, and a handful of test
120
- scripts have been updated to use it.
101
+ Dev support update.
102
103
Will merge to 'next'.
123
- I think I spotted one unused command, which we may want to remove, though.
104
105
--------------------------------------------------
106
[Stalled]
@@ -197,6 +177,108 @@ of the repositories listed at
177
--------------------------------------------------
178
[Cooking]
179
180
+* cb/windows-manifest (2019-06-27) 1 commit
181
+ (merged to 'next' on 2019-07-03 at 875721bdc9)
182
+ + mingw: embed a manifest to trick UAC into Doing The Right Thing
183
+
184
+ Windows update.
185
+
186
+ Will merge to 'master'.
187
+
188
+
189
+* js/mingw-gcc-stack-protect (2019-06-27) 1 commit
190
+ (merged to 'next' on 2019-07-03 at 7e3185f69d)
191
+ + mingw: enable stack smashing protector
192
+
193
+ Windows update.
194
+
195
+ Will merge to 'master'.
196
+
197
+
198
+* js/mingw-use-utf8 (2019-06-27) 2 commits
199
+ (merged to 'next' on 2019-07-03 at f528daf88d)
200
+ + mingw: use Unicode functions explicitly
201
+ + mingw: get pw_name in UTF-8 format
202
+
203
+ Windows update.
204
+
205
+ Will merge to 'master'.
206
+
207
+
208
+* kb/windows-force-utf8 (2019-06-27) 1 commit
209
+ - gettext: always use UTF-8 on native Windows
210
+
211
+ Windows update.
212
+
213
+ On hold.
214
+ cf. <nycvar.QRO.7.76.6.1907031321270.44@tvgsbejvaqbjf.bet>
215
+
216
+
217
+* js/rebase-reschedule-applies-only-to-interactive (2019-07-01) 1 commit
218
+ - rebase --am: ignore rebase.rescheduleFailedExec
219
+
220
+ The configuration variable rebase.rescheduleFailedExec should be
221
+ effective only while running an interactive rebase and should not
222
+ affect anything when running an non-interactive one, which was not
223
+ the case. This has been corrected.
224
+
225
+ Will merge to 'next'.
226
+
227
+
228
+* jt/t5551-test-chunked (2019-06-27) 1 commit
229
+ (merged to 'next' on 2019-07-03 at aafd74451c)
230
+ + t5551: test usage of chunked encoding explicitly
231
+
232
+ Update smart-http test.
233
+
234
+ Will merge to 'master'.
235
+
236
+
237
+* tb/ref-filter-multiple-patterns (2019-06-27) 1 commit
238
+ (merged to 'next' on 2019-07-03 at f59ad42c4a)
239
+ + ref-filter.c: find disjoint pattern prefixes
240
+
241
+ "git for-each-ref" with multiple patterns have been optimized.
242
+
243
+ Will merge to 'master'.
244
+
245
+
246
+* ew/repack-with-bitmaps-by-default (2019-07-01) 1 commit
247
+ - repack: disable bitmaps-by-default if .keep files exist
248
+
249
+ Generation of pack bitmaps are now disabled when .keep files exist,
250
+ as these are mutually exclusive features.
251
+
252
+ Will merge to 'next'.
253
+
254
+
255
+* jk/check-connected-with-alternates (2019-07-01) 2 commits
256
+ - check_everything_connected: assume alternate ref tips are valid
257
+ - object-store.h: move for_each_alternate_ref() from transport.h
258
+
259
+ The tips of refs from the alternate object store can be used as
260
+ starting point for reachability computation now.
261
+
262
+ Will merge to 'next'.
263
+
264
+
265
+* jk/test-commit-bulk (2019-07-02) 7 commits
266
+ - SQUASH???
267
+ - t6200: use test_commit_bulk
268
+ - t5703: use test_commit_bulk
269
+ - t5702: use test_commit_bulk
270
+ - t3311: use test_commit_bulk
271
+ - t5310: increase the number of bitmapped commits
272
+ - test-lib: introduce test_commit_bulk
273
+
274
+ A test helper has been introduced to optimize preparation of test
275
+ repositories with many simple commits, and a handful of test
276
+ scripts have been updated to use it.
277
+
278
+ Will merge to 'next'.
279
+ I think I spotted one unused command, which we may want to remove, though.
280
+
281
+
282
* ab/test-env (2019-06-21) 8 commits
283
- tests: make GIT_TEST_FAIL_PREREQS a boolean
284
- tests: replace test_tristate with "git env--helper"
@@ -213,6 +295,8 @@ of the repositories listed at
295
ways to spell true, like yes, on, etc., and also ways to spell
296
false, like no, off, etc." convention.
297
298
+ Will merge to 'next'.
299
+
300
301
* cc/first-contrib-tutorial (2019-06-24) 1 commit
302
(merged to 'next' on 2019-06-27 at a9f2ab2f21)
@@ -223,7 +307,7 @@ of the repositories listed at
307
Will merge to 'master'.
308
309
226
-* ds/early-access (2019-06-20) 3 commits
310
+* ds/early-access (2019-07-01) 3 commits
311
- repo-settings: pack.useSparse=true
312
- repo-settings: use index.version=4 by default
313
- repo-settings: create core.featureAdoptionRate setting
@@ -231,7 +315,8 @@ of the repositories listed at
315
A mechanism to enable newish configuration settings in bulk has
316
been invented.
317
234
- Looked mostly sane, modulo minor nits.
318
+ The model may need to be rethought. A linear scale with "early
319
+ adoption" mindset may not match diverse use cases of the tool.
320
321
322
* jh/msvc (2019-06-25) 20 commits
@@ -390,12 +475,12 @@ of the repositories listed at
475
Will merge to 'master'.
476
477
393
-* dr/progress-i18n (2019-06-24) 1 commit
478
+* dr/progress-i18n (2019-07-02) 1 commit
479
- l10n: localizable upload progress messages
480
481
Progress messages have been made localizable.
482
398
- Not quite with the code duplication...
483
+ Will merge to 'next'.
484
485
486
* jw/gitweb-sample-update (2019-06-24) 1 commit
@@ -419,15 +504,16 @@ of the repositories listed at
504
505
506
* pw/status-with-corrupt-sequencer-state (2019-06-27) 3 commits
422
- - status: do not report errors in sequencer/todo
423
- - sequencer: factor out todo command name parsing
424
- - sequencer: always allow tab after command name
507
+ (merged to 'next' on 2019-07-03 at 273aee6b3c)
508
+ + status: do not report errors in sequencer/todo
509
+ + sequencer: factor out todo command name parsing
510
+ + sequencer: always allow tab after command name
511
512
The code to read state files used by the sequencer machinery for
513
"git status" has been made more robust against a corrupt or stale
514
state files.
515
430
- Will merge to 'next'.
516
+ Will merge to 'master'.
517
518
519
* sg/t5551-fetch-smart-error-is-translated (2019-06-25) 1 commit
@@ -439,7 +525,7 @@ of the repositories listed at
525
Will merge to 'master'.
526
527
442
-* ab/no-kwset (2019-06-28) 9 commits
528
+* ab/no-kwset (2019-07-01) 10 commits
529
- grep: use PCRE v2 for optimized fixed-string search
530
- grep: remove the kwset optimization
531
- grep: drop support for \0 in --fixed-strings <pattern>
@@ -447,13 +533,15 @@ of the repositories listed at
533
- grep tests: move binary pattern tests into their own file
534
- grep tests: move "grep binary" alongside the rest
535
- grep: inline the return value of a function call used only once
536
+ - t4210: skip more command-line encoding tests on MinGW
537
- grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
538
- log tests: test regex backends in "--encode=<enc>" tests
539
540
Retire use of kwset library, which is an optimization for looking
541
for fixed strings, with use of pcre2 JIT.
542
456
- Will merge to 'next'.
543
+ On hold.
544
+ cf. <nycvar.QRO.7.76.6.1907021417050.48@tvgsbejvaqbjf.bet>
545
546
547
* mt/dir-iterator-updates (2019-06-25) 10 commits
@@ -486,6 +574,8 @@ of the repositories listed at
574
The tree-walk API learned to pass an in-core repository
575
instance throughout more codepaths.
576
577
+ Will merge to 'next'.
578
+
579
580
* cb/fsmonitor-intfix (2019-06-17) 1 commit
581
(merged to 'next' on 2019-06-26 at bed7c7e78b)
@@ -523,7 +613,8 @@ of the repositories listed at
613
learned to take a combined filter specification.
614
615
There is a bit of interaction with cc/multi-promisor topic, whose
526
- conflict resolution I have no confidence in X-<.
616
+ conflict resolution I have no confidence in X-<. Extra sets of
617
+ eyes are appreciated.
618
619
620
* pw/doc-synopsis-markup-opmode-options (2019-06-17) 1 commit
@@ -593,13 +684,12 @@ of the repositories listed at
684
Will merge to 'master'.
685
686
596
-* ra/cherry-pick-revert-skip (2019-06-24) 6 commits
687
+* ra/cherry-pick-revert-skip (2019-07-02) 5 commits
688
- cherry-pick/revert: advise using --skip
689
- cherry-pick/revert: add --skip option
690
- sequencer: use argv_array in reset_merge
691
- sequencer: rename reset_for_rollback to reset_merge
692
- sequencer: add advice for revert
602
- - advice: add sequencerInUse config variable
693
694
"git cherry-pick/revert" learned a new "--skip" action.
695
@@ -682,7 +772,10 @@ of the repositories listed at
772
Will merge to 'master'.
773
774
685
-* cc/test-oidmap (2019-06-17) 4 commits
775
+* cc/test-oidmap (2019-07-01) 6 commits
776
+ (merged to 'next' on 2019-07-01 at 331a414a24)
777
+ + t0016: add 'remove' subcommand test
778
+ + test-oidmap: remove 'add' subcommand
779
(merged to 'next' on 2019-06-27 at 247a4341ca)
780
+ test-hashmap: remove 'hash' command
781
+ oidmap: use sha1hash() instead of static hash() function
@@ -694,7 +787,9 @@ of the repositories listed at
787
Will merge to 'master'.
788
789
697
-* ds/midx-expire-repack (2019-06-11) 11 commits
790
+* ds/midx-expire-repack (2019-07-01) 12 commits
791
+ (merged to 'next' on 2019-07-01 at c2a907f395)
792
+ + t5319: use 'test-tool path-utils' instead of 'ls -l'
793
(merged to 'next' on 2019-06-27 at 35e6e3b38d)
794
+ t5319-multi-pack-index.sh: test batch size zero
795
+ midx: add test that 'expire' respects .keep files
@@ -742,6 +837,7 @@ of the repositories listed at
837
+ pager: add a helper function to clear the last line in the terminal
838
+ t3404: make the 'rebase.missingCommitsCheck=ignore' test more focused
839
+ t3404: modernize here doc style
840
+ (this branch is used by pw/rebase-progress-test-cleanup.)
841
842
Use "Erase in Line" CSI sequence that is already used in the editor
843
support to clear cruft in the progress output.
@@ -804,31 +900,32 @@ of the repositories listed at
900
901
902
* ds/commit-graph-incremental (2019-06-19) 18 commits
807
- - commit-graph: test verify across alternates
808
- - commit-graph: normalize commit-graph filenames
809
- - commit-graph: test --split across alternate without --split
810
- - commit-graph: test octopus merges with --split
811
- - commit-graph: clean up chains after flattened write
812
- - commit-graph: verify chains with --shallow mode
813
- - commit-graph: create options for split files
814
- - commit-graph: expire commit-graph files
815
- - commit-graph: allow cross-alternate chains
816
- - commit-graph: merge commit-graph chains
817
- - commit-graph: add --split option to builtin
818
- - commit-graph: write commit-graph chains
819
- - commit-graph: rearrange chunk count logic
820
- - commit-graph: add base graphs chunk
821
- - commit-graph: load commit-graph chains
822
- - commit-graph: rename commit_compare to oid_compare
823
- - commit-graph: prepare for commit-graph chains
824
- - commit-graph: document commit-graph chains
903
+ (merged to 'next' on 2019-07-03 at 5dee5edbdf)
904
+ + commit-graph: test verify across alternates
905
+ + commit-graph: normalize commit-graph filenames
906
+ + commit-graph: test --split across alternate without --split
907
+ + commit-graph: test octopus merges with --split
908
+ + commit-graph: clean up chains after flattened write
909
+ + commit-graph: verify chains with --shallow mode
910
+ + commit-graph: create options for split files
911
+ + commit-graph: expire commit-graph files
912
+ + commit-graph: allow cross-alternate chains
913
+ + commit-graph: merge commit-graph chains
914
+ + commit-graph: add --split option to builtin
915
+ + commit-graph: write commit-graph chains
916
+ + commit-graph: rearrange chunk count logic
917
+ + commit-graph: add base graphs chunk
918
+ + commit-graph: load commit-graph chains
919
+ + commit-graph: rename commit_compare to oid_compare
920
+ + commit-graph: prepare for commit-graph chains
921
+ + commit-graph: document commit-graph chains
922
(this branch uses ds/close-object-store and ds/commit-graph-write-refactor.)
923
924
The commits in a repository can be described by multiple
925
commit-graph files now, which allows the commit-graph files to be
926
updated incrementally.
927
831
- Will merge to 'next'.
928
+ Will cook in 'next'.
929
930
931
* tm/tag-gpgsign-config (2019-06-05) 1 commit
@@ -917,6 +1014,7 @@ of the repositories listed at
1014
1015
There is a bit of interaction with md/list-objects-filter-combo
1016
topic, whose conflict resolution I have no confidence in X-<.
1017
+ Extra sets of eyes are appreciated.
1018
1019
1020
* nd/switch-and-restore (2019-06-20) 46 commits
@@ -1046,7 +1144,10 @@ of the repositories listed at
1144
Will merge to 'master'.
1145
1146
1049
-* br/blame-ignore (2019-06-20) 9 commits
1147
+* br/blame-ignore (2019-07-01) 11 commits
1148
+ (merged to 'next' on 2019-07-01 at f4b79421c9)
1149
+ + t8014: remove unnecessary braces
1150
+ + blame: drop some unused function parameters
1151
(merged to 'next' on 2019-06-27 at 36b91a787f)
1152
+ blame: add a test to cover blame_coalesce()
1153
+ blame: use the fingerprint heuristic to match ignored lines
@@ -1057,9 +1158,8 @@ of the repositories listed at
1158
+ blame: use a helper function in blame_chunk()
1159
+ Move oidset_parse_file() to oidset.c
1160
+ fsck: rename and touch up init_skiplist()
1060
- (this branch is used by jk/br-blame-ignore-unused-fix.)
1161
1162
"git blame" learned to "ignore" commits in the history, whose
1163
effects (as well as their presence) get ignored.
1164
1065
- Needs a touch-up to reduce -Wunused-parameters error.
1165
+ Will cook in 'next'.