What's cooking (2019/10 #04)
Junio C Hamano committed
Oct 15, 2019 at 14:31 UTC
32c122c5025d7020ad74af89887f1c58f2945a03
1 file changed
+375
-292
whats-cooking.txt
+375
-292
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Oct 2019, #03; Fri, 11)
4
-X-master-at: 08da6496b61341ec45eac36afcc8f94242763468
5
-X-next-at: b869b98d4c7f0f91d905d76a6c8ba9b8799289b6
3
+Subject: What's cooking in git.git (Oct 2019, #04; Tue, 15)
4
+X-master-at: 108b97dc372828f0e72e56bbb40cae8e1e83ece6
5
+X-next-at: 75c0f4853af2bb694809b26e5840ced649a83e49
6
7
-What's cooking in git.git (Oct 2019, #03; Fri, 11)
7
+What's cooking in git.git (Oct 2019, #04; Tue, 15)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,9 +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
-I've been offline for a week or so, and have been trying to process
16
-the backlog, but I am sure there are still things to be picked up.
17
-
15
You can find the changes described here in the integration branches
16
of the repositories listed at
17
@@ -58,6 +55,14 @@ of the repositories listed at
55
Miscellaneous code clean-ups.
56
57
58
+* am/t0028-utf16-tests (2019-09-28) 2 commits
59
+ (merged to 'next' on 2019-10-09 at 453900a4e8)
60
+ + t0028: add more tests
61
+ + t0028: fix test for UTF-16-LE-BOM
62
+
63
+ Test fixes.
64
+
65
+
66
* am/visual-studio-config-fix (2019-09-28) 1 commit
67
(merged to 'next' on 2019-10-04 at 135d93143b)
68
+ contrib/buildsystems: fix Visual Studio Debug configuration
@@ -114,6 +119,27 @@ of the repositories listed at
119
PCRE fixes.
120
121
122
+* dl/format-patch-doc-test-cleanup (2019-10-09) 1 commit
123
+ (merged to 'next' on 2019-10-11 at 992da06f37)
124
+ + t4014: treat rev-list output as the expected value
125
+ (this branch is used by dl/format-patch-cover-from-desc.)
126
+
127
+ test cleanup.
128
+
129
+
130
+* dl/octopus-graph-bug (2019-10-04) 5 commits
131
+ (merged to 'next' on 2019-10-07 at c6bc2fe4a0)
132
+ + t4214: demonstrate octopus graph coloring failure
133
+ + t4214: explicitly list tags in log
134
+ + t4214: generate expect in their own test cases
135
+ + t4214: use test_merge
136
+ + test-lib: let test_merge() perform octopus merges
137
+
138
+ "git log --graph" for an octopus merge is sometimes colored
139
+ incorrectly, which is demonstrated and documented but not yet
140
+ fixed.
141
+
142
+
143
* dl/rev-list-doc-cleanup (2019-10-06) 1 commit
144
(merged to 'next' on 2019-10-07 at 712594feb1)
145
+ git-rev-list.txt: prune options in synopsis
@@ -121,6 +147,13 @@ of the repositories listed at
147
Doc update.
148
149
150
+* dl/t0000-skip-test-test (2019-10-09) 1 commit
151
+ (merged to 'next' on 2019-10-11 at b210c1d1fa)
152
+ + t0000: cover GIT_SKIP_TESTS blindspots
153
+
154
+ test update.
155
+
156
+
157
* en/clean-nested-with-ignored (2019-10-02) 13 commits
158
(merged to 'next' on 2019-10-03 at 969ec06cc7)
159
+ dir: special case check for the possibility that pathspec is NULL
@@ -141,6 +174,125 @@ of the repositories listed at
174
"git clean" fixes.
175
176
177
+* en/fast-imexport-nested-tags (2019-10-04) 8 commits
178
+ (merged to 'next' on 2019-10-07 at 3e75779e10)
179
+ + fast-export: handle nested tags
180
+ + t9350: add tests for tags of things other than a commit
181
+ + fast-export: allow user to request tags be marked with --mark-tags
182
+ + fast-export: add support for --import-marks-if-exists
183
+ + fast-import: add support for new 'alias' command
184
+ + fast-import: allow tags to be identified by mark labels
185
+ + fast-import: fix handling of deleted tags
186
+ + fast-export: fix exporting a tag and nothing else
187
+
188
+ Updates to fast-import/export.
189
+
190
+
191
+* en/merge-recursive-cleanup (2019-10-08) 26 commits
192
+ (merged to 'next' on 2019-10-09 at aab23cae2e)
193
+ + merge-recursive: fix the fix to the diff3 common ancestor label
194
+ (merged to 'next' on 2019-10-03 at 7b5a32726b)
195
+ + merge-recursive: fix the diff3 common ancestor label for virtual commits
196
+ (merged to 'next' on 2019-09-18 at f52cb08a14)
197
+ + merge-recursive: alphabetize include list
198
+ + merge-recursive: add sanity checks for relevant merge_options
199
+ + merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
200
+ + merge-recursive: split internal fields into a separate struct
201
+ + merge-recursive: avoid losing output and leaking memory holding that output
202
+ + merge-recursive: comment and reorder the merge_options fields
203
+ + merge-recursive: consolidate unnecessary fields in merge_options
204
+ + merge-recursive: move some definitions around to clean up the header
205
+ + merge-recursive: rename merge_options argument to opt in header
206
+ + merge-recursive: rename 'mrtree' to 'result_tree', for clarity
207
+ + merge-recursive: use common name for ancestors/common/base_list
208
+ + merge-recursive: fix some overly long lines
209
+ + cache-tree: share code between functions writing an index as a tree
210
+ + merge-recursive: don't force external callers to do our logging
211
+ + merge-recursive: remove useless parameter in merge_trees()
212
+ + merge-recursive: exit early if index != head
213
+ + Ensure index matches head before invoking merge machinery, round N
214
+ + merge-recursive: remove another implicit dependency on the_repository
215
+ + merge-recursive: future-proof update_file_flags() against memory leaks
216
+ + merge-recursive: introduce an enum for detect_directory_renames values
217
+ + merge-recursive: provide a better label for diff3 common ancestor
218
+ + merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()
219
+ + checkout: provide better conflict hunk description with detached HEAD
220
+ + merge-recursive: be consistent with assert
221
+
222
+ The merge-recursive machiery is one of the most complex parts of
223
+ the system that accumulated cruft over time. This large series
224
+ cleans up the implementation quite a bit.
225
+
226
+
227
+* ew/hashmap (2019-10-07) 20 commits
228
+ (merged to 'next' on 2019-10-09 at 9b75b4ce73)
229
+ + hashmap_entry: remove first member requirement from docs
230
+ + hashmap: remove type arg from hashmap_{get,put,remove}_entry
231
+ + OFFSETOF_VAR macro to simplify hashmap iterators
232
+ + hashmap: introduce hashmap_free_entries
233
+ + hashmap: hashmap_{put,remove} return hashmap_entry *
234
+ + hashmap: use *_entry APIs for iteration
235
+ + hashmap_cmp_fn takes hashmap_entry params
236
+ + hashmap_get{,_from_hash} return "struct hashmap_entry *"
237
+ + hashmap: use *_entry APIs to wrap container_of
238
+ + hashmap_get_next returns "struct hashmap_entry *"
239
+ + introduce container_of macro
240
+ + hashmap_put takes "struct hashmap_entry *"
241
+ + hashmap_remove takes "const struct hashmap_entry *"
242
+ + hashmap_get takes "const struct hashmap_entry *"
243
+ + hashmap_add takes "struct hashmap_entry *"
244
+ + hashmap_get_next takes "const struct hashmap_entry *"
245
+ + hashmap_entry_init takes "struct hashmap_entry *"
246
+ + packfile: use hashmap_entry in delta_base_cache_entry
247
+ + coccicheck: detect hashmap_entry.hash assignment
248
+ + diff: use hashmap_entry_init on moved_entry.ent
249
+
250
+ Code clean-up of the hashmap API, both users and implementation.
251
+
252
+
253
+* gs/commit-graph-trace-with-cmd (2019-10-02) 1 commit
254
+ (merged to 'next' on 2019-10-07 at 369df0e5cd)
255
+ + commit-graph: emit trace2 cmd_mode for each sub-command
256
+
257
+ Dev support.
258
+
259
+
260
+* gs/sq-quote-buf-pretty (2019-10-08) 1 commit
261
+ (merged to 'next' on 2019-10-11 at 2f7c00612b)
262
+ + sq_quote_buf_pretty: don't drop empty arguments
263
+
264
+ Pretty-printed command line formatter (used in e.g. reporting the
265
+ command being run by the tracing API) had a bug that lost an
266
+ argument that is an empty string, which has been corrected.
267
+
268
+
269
+* jk/coc (2019-10-10) 2 commits
270
+ (merged to 'next' on 2019-10-11 at 9765fd29c3)
271
+ + CODE_OF_CONDUCT: mention individual project-leader emails
272
+ + add a Code of Conduct document
273
+
274
+ Code-of-conduct document.
275
+
276
+
277
+* js/azure-pipelines-msvc (2019-10-06) 13 commits
278
+ (merged to 'next' on 2019-10-07 at d5a3604dc6)
279
+ + ci: also build and test with MS Visual Studio on Azure Pipelines
280
+ + ci: really use shallow clones on Azure Pipelines
281
+ + tests: let --immediate and --write-junit-xml play well together
282
+ + test-tool run-command: learn to run (parts of) the testsuite
283
+ + vcxproj: include more generated files
284
+ + vcxproj: only copy `git-remote-http.exe` once it was built
285
+ + msvc: work around a bug in GetEnvironmentVariable()
286
+ + msvc: handle DEVELOPER=1
287
+ + msvc: ignore some libraries when linking
288
+ + compat/win32/path-utils.h: add #include guards
289
+ + winansi: use FLEX_ARRAY to avoid compiler warning
290
+ + msvc: avoid using minus operator on unsigned types
291
+ + push: do not pretend to return `int` from `die_push_simple()`
292
+
293
+ CI updates.
294
+
295
+
296
* js/diff-rename-force-stable-sort (2019-10-02) 2 commits
297
(merged to 'next' on 2019-10-04 at e02d882510)
298
+ diffcore_rename(): use a stable sort
@@ -155,6 +307,15 @@ of the repositories listed at
307
results across platforms.
308
309
310
+* js/fetch-jobs (2019-10-06) 1 commit
311
+ (merged to 'next' on 2019-10-07 at e798bac35d)
312
+ + fetch: let --jobs=<n> parallelize --multiple, too
313
+
314
+ "git fetch --jobs=<n>" allowed <n> parallel jobs when fetching
315
+ submodules, but this did not apply to "git fetch --multiple" that
316
+ fetches from multiple remote repositories. It now does.
317
+
318
+
319
* js/mingw-spawn-with-spaces-in-path (2019-10-02) 1 commit
320
(merged to 'next' on 2019-10-04 at 0fdb87dd53)
321
+ t0061: fix test for argv[0] with spaces (MINGW only)
@@ -181,6 +342,43 @@ of the repositories listed at
342
to access the worktree correctly, which has been corrected.
343
344
345
+* js/trace2-cap-max-output-files (2019-10-05) 4 commits
346
+ (merged to 'next' on 2019-10-09 at e8a126d880)
347
+ + trace2: write discard message to sentinel files
348
+ + trace2: discard new traces if target directory has too many files
349
+ + docs: clarify trace2 version invariants
350
+ + docs: mention trace2 target-dir mode in git-config
351
+
352
+ The trace2 output, when sending them to files in a designated
353
+ directory, can populate the directory with too many files; a
354
+ mechanism is introduced to set the maximum number of files and
355
+ discard further logs when the maximum is reached.
356
+
357
+
358
+* js/trace2-fetch-push (2019-10-08) 3 commits
359
+ (merged to 'next' on 2019-10-11 at 3a2bb143f8)
360
+ + transport: push codepath can take arbitrary repository
361
+ (merged to 'next' on 2019-10-04 at 1d63701064)
362
+ + push: add trace2 instrumentation
363
+ + fetch: add trace2 instrumentation
364
+
365
+ Dev support.
366
+
367
+
368
+* js/xdiffi-comment-updates (2019-10-09) 1 commit
369
+ (merged to 'next' on 2019-10-11 at 157226cf3a)
370
+ + xdiffi: fix typos and touch up comments
371
+
372
+ Comment update.
373
+
374
+
375
+* jt/push-avoid-lazy-fetch (2019-10-09) 1 commit
376
+ (merged to 'next' on 2019-10-11 at b5efe1634a)
377
+ + send-pack: never fetch when checking exclusions
378
+
379
+ Performance hack.
380
+
381
+
382
* kt/add-i-progress (2019-10-04) 1 commit
383
(merged to 'next' on 2019-10-07 at 00cf8fe076)
384
+ add -i: show progress counter in the prompt
@@ -241,6 +439,14 @@ of the repositories listed at
439
Integer arithmetic fix.
440
441
442
+* tg/range-diff-output-update (2019-10-09) 1 commit
443
+ (merged to 'next' on 2019-10-11 at fd8c5d7ec5)
444
+ + range-diff: don't segfault with mode-only changes
445
+
446
+ "git range-diff" failed to handle mode-only change, which has been
447
+ corrected.
448
+
449
+
450
* tk/git-svn-trim-author-name (2019-09-28) 1 commit
451
(merged to 'next' on 2019-10-04 at c1c619f7c4)
452
+ git-svn: trim leading and trailing whitespaces in author name
@@ -252,133 +458,187 @@ of the repositories listed at
458
[New Topics]
459
460
* ds/sparse-cone (2019-10-08) 17 commits
255
- - sparse-checkout: cone mode should not interact with .gitignore
256
- - sparse-checkout: write using lockfile
257
- - sparse-checkout: update working directory in-process
258
- - sparse-checkout: sanitize for nested folders
259
- - read-tree: show progress by default
260
- - unpack-trees: add progress to clear_ce_flags()
261
- - unpack-trees: hash less in cone mode
262
- - sparse-checkout: init and set in cone mode
263
- - sparse-checkout: use hashmaps for cone patterns
264
- - sparse-checkout: add 'cone' mode
265
- - trace2: add region in clear_ce_flags
266
- - sparse-checkout: create 'disable' subcommand
267
- - sparse-checkout: add '--stdin' option to set subcommand
268
- - sparse-checkout: 'set' subcommand
269
- - clone: add --sparse mode
270
- - sparse-checkout: create 'init' subcommand
271
- - sparse-checkout: create builtin with 'list' subcommand
461
+ . sparse-checkout: cone mode should not interact with .gitignore
462
+ . sparse-checkout: write using lockfile
463
+ . sparse-checkout: update working directory in-process
464
+ . sparse-checkout: sanitize for nested folders
465
+ . read-tree: show progress by default
466
+ . unpack-trees: add progress to clear_ce_flags()
467
+ . unpack-trees: hash less in cone mode
468
+ . sparse-checkout: init and set in cone mode
469
+ . sparse-checkout: use hashmaps for cone patterns
470
+ . sparse-checkout: add 'cone' mode
471
+ . trace2: add region in clear_ce_flags
472
+ . sparse-checkout: create 'disable' subcommand
473
+ . sparse-checkout: add '--stdin' option to set subcommand
474
+ . sparse-checkout: 'set' subcommand
475
+ . clone: add --sparse mode
476
+ . sparse-checkout: create 'init' subcommand
477
+ . sparse-checkout: create builtin with 'list' subcommand
478
479
Management of sparsely checked-out working tree has gained a
480
dedicated "sparse-checkout" command.
481
276
- Seems not to play well with the hashmap updates.
482
+ Expecting a reroll on top of we/hashmap.
483
+ The use of hashmap API does not work well with ew/hashmap updates
484
+ and breaks build.
485
486
279
-* dl/format-patch-doc-test-cleanup (2019-10-09) 1 commit
280
- (merged to 'next' on 2019-10-11 at 992da06f37)
281
- + t4014: treat rev-list output as the expected value
487
+* wb/fsmonitor-bitmap-fix (2019-10-12) 1 commit
488
+ (merged to 'next' on 2019-10-15 at 1cc4091346)
489
+ + fsmonitor: don't fill bitmap with entries to be removed
490
283
- test cleanup.
491
+ A segfault fix.
492
493
Will merge to 'master'.
494
495
288
-* dl/t0000-skip-test-test (2019-10-09) 1 commit
289
- (merged to 'next' on 2019-10-11 at b210c1d1fa)
290
- + t0000: cover GIT_SKIP_TESTS blindspots
496
+* dl/compat-cleanup (2019-10-11) 1 commit
497
+ (merged to 'next' on 2019-10-15 at 1ed99770ba)
498
+ + pthread.h: manually align parameter lists
499
292
- test update.
500
+ Code formatting micronit fix.
501
502
Will merge to 'master'.
503
504
297
-* gs/sq-quote-buf-pretty (2019-10-08) 1 commit
298
- (merged to 'next' on 2019-10-11 at 2f7c00612b)
299
- + sq_quote_buf_pretty: don't drop empty arguments
505
+* jj/stash-reset-only-toplevel (2019-10-15) 1 commit
506
+ (merged to 'next' on 2019-10-15 at 28f398daab)
507
+ + stash: avoid recursive hard reset on submodules
508
301
- Pretty-printed command line formatter (used in e.g. reporting the
302
- command being run by the tracing API) had a bug that lost an
303
- argument that is an empty string, which has been corrected.
509
+ "git stash save" lost local changes to submodules, which has been
510
+ corrected.
511
512
Will merge to 'master'.
513
514
308
-* jk/coc (2019-10-10) 2 commits
309
- (merged to 'next' on 2019-10-11 at 9765fd29c3)
310
- + CODE_OF_CONDUCT: mention individual project-leader emails
311
- + add a Code of Conduct document
515
+* js/doc-stash-save (2019-10-11) 1 commit
516
+ (merged to 'next' on 2019-10-15 at e588bff32c)
517
+ + doc(stash): clarify the description of `save`
518
313
- Code-of-conduct document.
519
+ Doc clarification.
520
521
Will merge to 'master'.
522
523
318
-* js/xdiffi-comment-updates (2019-10-09) 1 commit
319
- (merged to 'next' on 2019-10-11 at 157226cf3a)
320
- + xdiffi: fix typos and touch up comments
524
+* ta/t1308-typofix (2019-10-11) 1 commit
525
+ (merged to 'next' on 2019-10-15 at 0228b44688)
526
+ + t1308-config-set: fix a test that has a typo
527
322
- Comment update.
528
+ Test fix.
529
530
Will merge to 'master'.
531
532
327
-* jt/push-avoid-lazy-fetch (2019-10-09) 1 commit
328
- (merged to 'next' on 2019-10-11 at b5efe1634a)
329
- + send-pack: never fetch when checking exclusions
533
+* bb/compat-util-comment-fix (2019-10-12) 1 commit
534
+ (merged to 'next' on 2019-10-15 at c15e45fe28)
535
+ + git-compat-util: fix documentation syntax
536
331
- Performance hack.
537
+ Code cleanup.
538
539
Will merge to 'master'.
540
541
336
-* tg/range-diff-output-update (2019-10-09) 1 commit
337
- (merged to 'next' on 2019-10-11 at fd8c5d7ec5)
338
- + range-diff: don't segfault with mode-only changes
542
+* bb/utf8-wcwidth-cleanup (2019-10-12) 1 commit
543
+ (merged to 'next' on 2019-10-15 at 92ba59e1d6)
544
+ + utf8: use ARRAY_SIZE() in git_wcwidth()
545
340
- "git range-diff" failed to handle mode-only change, which has been
341
- corrected.
546
+ Code cleanup.
547
548
Will merge to 'master'.
549
550
346
-* wb/fsmonitor-bitmap-fix (2019-10-10) 1 commit
347
- - fsmonitor: don't fill bitmap with entries to be removed
551
+* bc/smart-http-atomic-push (2019-10-15) 1 commit
552
+ (merged to 'next' on 2019-10-15 at effe020c20)
553
+ + remote-curl: pass on atomic capability to remote side
554
349
- A segfault fix.
555
+ The atomic push over smart HTTP transport did not work, which has
556
+ been corrected.
557
351
- Perhaps an update to the test script may be worth doing?
352
- cf. <20191010110732.GJ29845@szeder.dev>
558
+ Will merge to 'master'.
559
560
355
-* dl/compat-cleanup (2019-10-11) 1 commit
356
- - pthread.h: manually align parameter lists
561
+* dl/allow-running-cocci-verbosely (2019-10-12) 1 commit
562
+ (merged to 'next' on 2019-10-15 at 474dc9f86e)
563
+ + Makefile: respect $(V) in %.cocci.patch target
564
358
- Code formatting micronit fix.
565
+ Dev support update.
566
360
- Will merge to 'next'.
567
+ Will merge to 'master'.
568
569
363
-* jj/stash-reset-only-toplevel (2019-10-11) 1 commit
364
- - stash: avoid recursive hard reset on submodules
570
+* dl/format-patch-cover-from-desc (2019-10-15) 3 commits
571
+ - format-patch: teach --cover-from-description option
572
+ - format-patch: use enum variables
573
+ - format-patch: change erroneous and condition
574
575
+ The branch description ("git branch --edit-description") has been
576
+ used to fill the body of the cover letters by the format-patch
577
+ command; this has been enhanced so that the subject can also be
578
+ filled.
579
367
-* js/doc-stash-save (2019-10-11) 1 commit
368
- - doc(stash): clarify the description of `save`
580
+ Expecting a reroll.
581
370
- Doc clarification.
582
372
- Will merge to 'next'.
583
+* en/merge-recursive-directory-rename-fixes (2019-10-12) 2 commits
584
+ (merged to 'next' on 2019-10-15 at ebfdc3ff7b)
585
+ + merge-recursive: fix merging a subdirectory into the root directory
586
+ + merge-recursive: clean up get_renamed_dir_portion()
587
588
+ A few glitches in the heuristic in merge-recursive to infer file
589
+ movements based on movements of other files in the same directory
590
+ have been corrected.
591
375
-* ta/t1308-typofix (2019-10-11) 1 commit
376
- - t1308-config-set: fix a test that has a typo
592
+ Will merge to 'master'.
593
378
- Test fix.
594
+
595
+* jt/fetch-pack-record-refs-in-the-dot-promisor (2019-10-15) 1 commit
596
+ - fetch-pack: write fetched refs to .promisor
597
+
598
+ Debugging support for lazy cloning has been a bit improved.
599
600
Will merge to 'next'.
601
602
+
603
+* mb/clarify-zsh-completion-doc (2019-10-12) 1 commit
604
+ - doc: Change zsh git completion file name
605
+
606
+ The installation instruction for zsh completion script (in
607
+ contrib/) has been a bit improved.
608
+
609
+ Expecting a reroll.
610
+
611
+
612
+* rs/column-use-utf8-strnwidth (2019-10-15) 1 commit
613
+ (merged to 'next' on 2019-10-15 at 3be15b4478)
614
+ + column: use utf8_strnwidth() to strip out ANSI color escapes
615
+
616
+ Code cleanup.
617
+
618
+ Will merge to 'master'.
619
+
620
+
621
+* rs/http-push-simplify (2019-10-15) 1 commit
622
+ (merged to 'next' on 2019-10-15 at 4abc29286c)
623
+ + http-push: simplify deleting a list item
624
+
625
+ Code cleanup.
626
+
627
+ Will merge to 'master'.
628
+
629
+
630
+* rs/remote-curl-use-argv-array (2019-10-15) 1 commit
631
+ (merged to 'next' on 2019-10-15 at 8d0375a874)
632
+ + remote-curl: use argv_array in parse_push()
633
+
634
+ Code cleanup.
635
+
636
+ Will merge to 'master'.
637
+
638
+
639
+* nr/diff-highlight-indent-fix (2019-10-15) 1 commit
640
+ - diff-highlight: fix a whitespace nit
641
+
642
--------------------------------------------------
643
[Stalled]
644
@@ -392,24 +652,6 @@ of the repositories listed at
652
cf. <CAPUEspjJNSrJQT7xV2fsdp2t5odW5fzzPdDxuar_5x_JPUtf6Q@mail.gmail.com>
653
654
395
-* es/walken-tutorial (2019-10-11) 2 commits
396
- - SQUASH???
397
- - documentation: add tutorial for object walking
398
-
399
- A tutorial on object enumeration.
400
-
401
-
402
-
403
-* dl/format-patch-cover-letter-subject (2019-09-05) 1 commit
404
- - format-patch: learn --infer-cover-subject option
405
-
406
- "git format-patch --cover-letter" learned to optionally use the
407
- first paragraph (typically a single-liner) of branch.*.description
408
- as the subject of the cover letter.
409
-
410
- Reroll with a redesign with less emphasis on "subject" coming?
411
-
412
-
655
* jn/unknown-index-extensions (2018-11-21) 2 commits
656
- index: offer advice for unknown index extensions
657
- index: do not warn about unrecognized extensions
@@ -432,21 +674,6 @@ of the repositories listed at
674
Needs tests.
675
676
435
-* jt/fetch-cdn-offload (2019-03-12) 9 commits
436
- - SQUASH???
437
- - upload-pack: send part of packfile response as uri
438
- - fetch-pack: support more than one pack lockfile
439
- - upload-pack: refactor reading of pack-objects out
440
- - Documentation: add Packfile URIs design doc
441
- - Documentation: order protocol v2 sections
442
- - http-fetch: support fetching packfiles by URL
443
- - http: improve documentation of http_pack_request
444
- - http: use --stdin when getting dumb HTTP pack
445
-
446
- WIP for allowing a response to "git fetch" to instruct the bulk of
447
- the pack contents to be instead taken from elsewhere (aka CDN).
448
-
449
-
677
* js/protocol-advertise-multi (2018-12-28) 1 commit
678
- protocol: advertise multiple supported versions
679
@@ -469,55 +696,12 @@ of the repositories listed at
696
--------------------------------------------------
697
[Cooking]
698
472
-* dl/octopus-graph-bug (2019-10-04) 5 commits
473
- (merged to 'next' on 2019-10-07 at c6bc2fe4a0)
474
- + t4214: demonstrate octopus graph coloring failure
475
- + t4214: explicitly list tags in log
476
- + t4214: generate expect in their own test cases
477
- + t4214: use test_merge
478
- + test-lib: let test_merge() perform octopus merges
479
-
480
- "git log --graph" for an octopus merge is sometimes colored
481
- incorrectly, which is demonstrated and documented but not yet
482
- fixed.
483
-
484
- Will merge to 'master'.
485
-
486
-
487
-* js/azure-pipelines-msvc (2019-10-06) 13 commits
488
- (merged to 'next' on 2019-10-07 at d5a3604dc6)
489
- + ci: also build and test with MS Visual Studio on Azure Pipelines
490
- + ci: really use shallow clones on Azure Pipelines
491
- + tests: let --immediate and --write-junit-xml play well together
492
- + test-tool run-command: learn to run (parts of) the testsuite
493
- + vcxproj: include more generated files
494
- + vcxproj: only copy `git-remote-http.exe` once it was built
495
- + msvc: work around a bug in GetEnvironmentVariable()
496
- + msvc: handle DEVELOPER=1
497
- + msvc: ignore some libraries when linking
498
- + compat/win32/path-utils.h: add #include guards
499
- + winansi: use FLEX_ARRAY to avoid compiler warning
500
- + msvc: avoid using minus operator on unsigned types
501
- + push: do not pretend to return `int` from `die_push_simple()`
502
-
503
- CI updates.
504
-
505
- Will merge to 'master'.
506
-
507
-
508
-* js/trace2-cap-max-output-files (2019-10-05) 4 commits
509
- (merged to 'next' on 2019-10-09 at e8a126d880)
510
- + trace2: write discard message to sentinel files
511
- + trace2: discard new traces if target directory has too many files
512
- + docs: clarify trace2 version invariants
513
- + docs: mention trace2 target-dir mode in git-config
699
+* es/walken-tutorial (2019-10-12) 1 commit
700
+ - documentation: add tutorial for object walking
701
515
- The trace2 output, when sending them to files in a designated
516
- directory, can populate the directory with too many files; a
517
- mechanism is introduced to set the maximum number of files and
518
- discard further logs when the maximum is reached.
702
+ A tutorial on object enumeration.
703
520
- Will merge to 'master'.
704
+ Will merge to 'next'.
705
706
707
* bc/hash-independent-tests-part-6 (2019-10-06) 15 commits
@@ -543,14 +727,14 @@ of the repositories listed at
727
cf. <20191008194012.4s35pbwbh25rblhb@camp.crustytoothpaste.net>
728
729
546
-* bw/format-patch-o-create-leading-dirs (2019-10-06) 1 commit
547
- - format-patch: create leading components of output directory
730
+* bw/format-patch-o-create-leading-dirs (2019-10-12) 1 commit
731
+ (merged to 'next' on 2019-10-15 at 93c9949b6a)
732
+ + format-patch: create leading components of output directory
733
734
"git format-patch -o <outdir>" did an equivalent of "mkdir <outdir>"
735
not "mkdir -p <outdir>", which is being corrected.
736
552
- Use of adjust shared perm on the leading directory may have
553
- security implictions.
737
+ Will merge to 'master'.
738
739
740
* ag/sequencer-todo-updates (2019-10-08) 5 commits
@@ -566,38 +750,6 @@ of the repositories listed at
750
Will merge to 'next'.
751
752
569
-* js/fetch-jobs (2019-10-06) 1 commit
570
- (merged to 'next' on 2019-10-07 at e798bac35d)
571
- + fetch: let --jobs=<n> parallelize --multiple, too
572
-
573
- "git fetch --jobs=<n>" allowed <n> parallel jobs when fetching
574
- submodules, but this did not apply to "git fetch --multiple" that
575
- fetches from multiple remote repositories. It now does.
576
-
577
- Will merge to 'master'.
578
-
579
-
580
-* gs/commit-graph-trace-with-cmd (2019-10-02) 1 commit
581
- (merged to 'next' on 2019-10-07 at 369df0e5cd)
582
- + commit-graph: emit trace2 cmd_mode for each sub-command
583
-
584
- Dev support.
585
-
586
- Will merge to 'master'.
587
-
588
-
589
-* js/trace2-fetch-push (2019-10-08) 3 commits
590
- (merged to 'next' on 2019-10-11 at 3a2bb143f8)
591
- + transport: push codepath can take arbitrary repository
592
- (merged to 'next' on 2019-10-04 at 1d63701064)
593
- + push: add trace2 instrumentation
594
- + fetch: add trace2 instrumentation
595
-
596
- Dev support.
597
-
598
- Will merge to 'master'.
599
-
600
-
753
* mt/threaded-grep-in-object-store (2019-10-02) 11 commits
754
- grep: move driver pre-load out of critical section
755
- grep: re-enable threads in non-worktree case
@@ -616,32 +768,6 @@ of the repositories listed at
768
layer is not thread-safe. This limitation is getting lifted.
769
770
619
-* am/t0028-utf16-tests (2019-09-28) 2 commits
620
- (merged to 'next' on 2019-10-09 at 453900a4e8)
621
- + t0028: add more tests
622
- + t0028: fix test for UTF-16-LE-BOM
623
-
624
- Test fixes.
625
-
626
- Will merge to 'master'.
627
-
628
-
629
-* en/fast-imexport-nested-tags (2019-10-04) 8 commits
630
- (merged to 'next' on 2019-10-07 at 3e75779e10)
631
- + fast-export: handle nested tags
632
- + t9350: add tests for tags of things other than a commit
633
- + fast-export: allow user to request tags be marked with --mark-tags
634
- + fast-export: add support for --import-marks-if-exists
635
- + fast-import: add support for new 'alias' command
636
- + fast-import: allow tags to be identified by mark labels
637
- + fast-import: fix handling of deleted tags
638
- + fast-export: fix exporting a tag and nothing else
639
-
640
- Updates to fast-import/export.
641
-
642
- Will merge to 'master'.
643
-
644
-
771
* jk/packfile-reuse-cleanup (2019-09-13) 10 commits
772
(merged to 'next' on 2019-09-30 at dc60b31833)
773
+ pack-objects: improve partial packfile reuse
@@ -662,34 +788,6 @@ of the repositories listed at
788
cf. <20191002155721.GD6116@sigill.intra.peff.net>
789
790
665
-* ew/hashmap (2019-10-07) 20 commits
666
- (merged to 'next' on 2019-10-09 at 9b75b4ce73)
667
- + hashmap_entry: remove first member requirement from docs
668
- + hashmap: remove type arg from hashmap_{get,put,remove}_entry
669
- + OFFSETOF_VAR macro to simplify hashmap iterators
670
- + hashmap: introduce hashmap_free_entries
671
- + hashmap: hashmap_{put,remove} return hashmap_entry *
672
- + hashmap: use *_entry APIs for iteration
673
- + hashmap_cmp_fn takes hashmap_entry params
674
- + hashmap_get{,_from_hash} return "struct hashmap_entry *"
675
- + hashmap: use *_entry APIs to wrap container_of
676
- + hashmap_get_next returns "struct hashmap_entry *"
677
- + introduce container_of macro
678
- + hashmap_put takes "struct hashmap_entry *"
679
- + hashmap_remove takes "const struct hashmap_entry *"
680
- + hashmap_get takes "const struct hashmap_entry *"
681
- + hashmap_add takes "struct hashmap_entry *"
682
- + hashmap_get_next takes "const struct hashmap_entry *"
683
- + hashmap_entry_init takes "struct hashmap_entry *"
684
- + packfile: use hashmap_entry in delta_base_cache_entry
685
- + coccicheck: detect hashmap_entry.hash assignment
686
- + diff: use hashmap_entry_init on moved_entry.ent
687
-
688
- Code clean-up of the hashmap API, both users and implementation.
689
-
690
- Will merge to 'master'.
691
-
692
-
791
* js/builtin-add-i (2019-08-30) 11 commits
792
. built-in add -i: implement the `help` command
793
. built-in add -i: use color in the main loop
@@ -708,44 +806,6 @@ of the repositories listed at
806
On hold, waiting for tg/stash-refresh-index to work well with this.
807
808
711
-* en/merge-recursive-cleanup (2019-10-08) 26 commits
712
- (merged to 'next' on 2019-10-09 at aab23cae2e)
713
- + merge-recursive: fix the fix to the diff3 common ancestor label
714
- (merged to 'next' on 2019-10-03 at 7b5a32726b)
715
- + merge-recursive: fix the diff3 common ancestor label for virtual commits
716
- (merged to 'next' on 2019-09-18 at f52cb08a14)
717
- + merge-recursive: alphabetize include list
718
- + merge-recursive: add sanity checks for relevant merge_options
719
- + merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
720
- + merge-recursive: split internal fields into a separate struct
721
- + merge-recursive: avoid losing output and leaking memory holding that output
722
- + merge-recursive: comment and reorder the merge_options fields
723
- + merge-recursive: consolidate unnecessary fields in merge_options
724
- + merge-recursive: move some definitions around to clean up the header
725
- + merge-recursive: rename merge_options argument to opt in header
726
- + merge-recursive: rename 'mrtree' to 'result_tree', for clarity
727
- + merge-recursive: use common name for ancestors/common/base_list
728
- + merge-recursive: fix some overly long lines
729
- + cache-tree: share code between functions writing an index as a tree
730
- + merge-recursive: don't force external callers to do our logging
731
- + merge-recursive: remove useless parameter in merge_trees()
732
- + merge-recursive: exit early if index != head
733
- + Ensure index matches head before invoking merge machinery, round N
734
- + merge-recursive: remove another implicit dependency on the_repository
735
- + merge-recursive: future-proof update_file_flags() against memory leaks
736
- + merge-recursive: introduce an enum for detect_directory_renames values
737
- + merge-recursive: provide a better label for diff3 common ancestor
738
- + merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()
739
- + checkout: provide better conflict hunk description with detached HEAD
740
- + merge-recursive: be consistent with assert
741
-
742
- The merge-recursive machiery is one of the most complex parts of
743
- the system that accumulated cruft over time. This large series
744
- cleans up the implementation quite a bit.
745
-
746
- Will merge to 'master'.
747
-
748
-
809
* vn/reset-deleted-ita (2019-07-26) 1 commit
810
- reset: unstage empty deleted ita files
811
@@ -769,15 +829,6 @@ of the repositories listed at
829
Needs to consider existing GIT_COMMITTER_DATE environment, etc.
830
cf. <5adde732-173b-d24d-d23f-bb4d043076d7@gmail.com>
831
772
-
773
-* jc/format-patch-noclobber (2019-02-22) 1 commit
774
- - format-patch: --no-clobber refrains from overwriting output files
775
-
776
- "git format-patch" used to overwrite an existing patch/cover-letter
777
- file. A new "--no-clobber" option stops it.
778
-
779
- Will discard.
780
-
832
--------------------------------------------------
833
[Discarded]
834
@@ -825,3 +876,35 @@ of the repositories listed at
876
macros predefined by the $(MAKE) procedure.
877
878
Superseded by dl/honor-cflags-in-hdr-check series.
879
+
880
+
881
+* dl/format-patch-cover-letter-subject (2019-09-05) 1 commit
882
+ . format-patch: learn --infer-cover-subject option
883
+
884
+ "git format-patch --cover-letter" learned to optionally use the
885
+ first paragraph (typically a single-liner) of branch.*.description
886
+ as the subject of the cover letter.
887
+
888
+ Superseded by the dl/format-patch-cover-from desc topic.
889
+
890
+
891
+* jt/fetch-cdn-offload (2019-03-12) 9 commits
892
+ . SQUASH???
893
+ . upload-pack: send part of packfile response as uri
894
+ . fetch-pack: support more than one pack lockfile
895
+ . upload-pack: refactor reading of pack-objects out
896
+ . Documentation: add Packfile URIs design doc
897
+ . Documentation: order protocol v2 sections
898
+ . http-fetch: support fetching packfiles by URL
899
+ . http: improve documentation of http_pack_request
900
+ . http: use --stdin when getting dumb HTTP pack
901
+
902
+ WIP for allowing a response to "git fetch" to instruct the bulk of
903
+ the pack contents to be instead taken from elsewhere (aka CDN).
904
+
905
+
906
+* jc/format-patch-noclobber (2019-02-22) 1 commit
907
+ . format-patch: --no-clobber refrains from overwriting output files
908
+
909
+ "git format-patch" used to overwrite an existing patch/cover-letter
910
+ file. A new "--no-clobber" option stops it.