What's cooking (2023/06 #04)
Junio C Hamano committed
Jun 14, 2023 at 13:55 UTC
cf824b16617f292be7dfd95f4719f0ab3354996a
1 file changed
+382
-353
whats-cooking.txt
+382
-353
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jun 2023, #03; Mon, 12)
3
-X-master-at: fe86abd7511a9a6862d5706c6fa1d9b57a63ba09
4
-X-next-at: 0019c0ddb0f4de1640983ab94f7f6608e68b7c17
2
+Subject: What's cooking in git.git (Jun 2023, #04; Wed, 14)
3
+X-master-at: d7d8841f67f29e6ecbad85a11805c907d0f00d5d
4
+X-next-at: 91eec092e0048861e489d5248932fabb011982fc
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jun 2023, #03; Mon, 12)
7
+What's cooking in git.git (Jun 2023, #04; Wed, 14)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,12 +17,6 @@ topic without enough support may be discarded after a long period of
17
no activity (of course they can be resubmit when new interests
18
arise).
19
20
-Sorry for being rather quiet for a few weeks. I was visiting Japan,
21
-attending a couple of memorial services, and then got sick and was
22
-in bed for about a week X-<. It makes you feel really old when a
23
-friend from your highschool days passes away. I think I've caught
24
-up with the list traffic, but stale topics may want to be re-sent.
25
-
20
Copies of the source code to Git live in many repositories, and the
21
following is a list of the ones I push into or their mirrors. Some
22
repositories have only a subset of branches.
@@ -54,130 +48,132 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[New Topics]
50
57
-* as/dtype-compilation-fix (2023-06-12) 1 commit
58
- - statinfo.h: move DTYPE defines from dir.h
51
+* jc/notes-separator-fix (2023-06-13) 1 commit
52
+ (merged to 'next' on 2023-06-14 at 3321da32a9)
53
+ + notes: do not access before the beginning of an array
54
+ (this branch uses tl/notes-separator.)
55
60
- Compilation fix for platforms without D_TYPE in struct dirent.
56
+ Fix to tl/notes-separator topic.
57
62
- Will merge to 'next'.
63
- source: <20230606205935.3183276-1-asedeno@google.com>
58
+ Will merge to 'master'.
59
+ source: <cover.1682671758.git.dyroneteng@gmail.com>
60
61
66
-* la/docs-typofixes (2023-06-12) 1 commit
67
- - docs: typofixes
62
+* js/doc-unit-tests (2023-06-13) 1 commit
63
+ - unit tests: Add a project plan document
64
69
- Typofixes.
65
+ Process to add some form of low-level unit tests has started.
66
71
- Will merge to 'next'.
72
- source: <pull.1542.v2.git.1686166007816.gitgitgadget@gmail.com>
67
+ Comments? Filling in blanks?
68
+ source: <8afdb215d7e10ca16a2ce8226b4127b3d8a2d971.1686352386.git.steadmon@google.com>
69
70
75
-* mh/mingw-case-sensitive-build (2023-06-12) 1 commit
76
- - mingw: use lowercase includes for some Windows headers
71
+* jt/doc-use-octal-with-printf (2023-06-13) 1 commit
72
+ - CodingGuidelines: use octal escapes, not hex
73
78
- Names of MinGW header files are spelled in mixed case in some
79
- source files, but the build host can be using case sensitive
80
- filesystem with header files with their name spelled in all
81
- lowercase.
74
+ Suggest to refrain from using hex literals that are non-portable
75
+ when writing printf(1) format strings.
76
83
- Needs review.
84
- source: <20230604211934.1365289-1-mh@glandium.org>
77
+ Will merge to 'next'.
78
+ source: <20230614001558.277755-1-jonathantanmy@google.com>
79
80
87
-* pb/complete-diff-options (2023-06-12) 25 commits
88
- - diff.c: mention completion above add_diff_options
89
- - completion: complete --remerge-diff
90
- - completion: complete --diff-merges, its options and --no-diff-merges
91
- - completion: move --pickaxe-{all,regex} to __git_diff_common_options
92
- - completion: complete --ws-error-highlight
93
- - completion: complete --unified
94
- - completion: complete --patch-with-raw
95
- - completion: complete --output-indicator-{context,new,old}
96
- - completion: complete --output
97
- - completion: complete --no-stat
98
- - completion: complete --no-relative
99
- - completion: complete --line-prefix
100
- - completion: complete --ita-invisible-in-index and --ita-visible-in-index
101
- - completion: complete --irreversible-delete
102
- - completion: complete --ignore-matching-lines
103
- - completion: complete --function-context
104
- - completion: complete --find-renames
105
- - completion: complete --find-object
106
- - completion: complete --find-copies
107
- - completion: complete --default-prefix
108
- - completion: complete --compact-summary
109
- - completion: complete --combined-all-paths
110
- - completion: complete --cc
111
- - completion: complete --break-rewrites
112
- - completion: add comments describing __git_diff_* globals
81
+* js/defeat-ignore-submodules-config-with-explicit-addition (2023-06-14) 1 commit
82
+ - diff-lib: honor override_submodule_config flag bit
83
114
- Completion updates.
84
+ Even when diff.ignoreSubmodules tells us to ignore submodule
85
+ changes, "git commit" with an index that already records changes to
86
+ submodules should include the submodule changes in the resulting
87
+ commit, but it did not.
88
116
- Expecting a reroll.
117
- cf. <5cba334c-4d75-0dac-20c6-9e3def1f224a@gmail.com>
118
- source: <pull.1543.v2.git.1686574374.gitgitgadget@gmail.com>
89
+ Will merge to 'next'.
90
+ source: <20230614164856.3186012-2-sokcevic@google.com>
91
92
+--------------------------------------------------
93
+[Graduated to 'master']
94
121
-* rj/leakfixes (2023-06-12) 6 commits
122
- - branch: fix a leak in setup_tracking
123
- - branch: fix a leak in check_tracking_branch
124
- - branch: fix a leak in inherit_tracking
125
- - branch: fix a leak in dwim_and_setup_tracking
126
- - remote: fix a leak in query_matches_negative_refspec
127
- - config: fix a leak in git_config_copy_or_rename_section_in_file
95
+* gc/doc-cocci-updates (2023-04-27) 2 commits
96
+ (merged to 'next' on 2023-05-20 at 3fe237c1a8)
97
+ + cocci: codify authoring and reviewing practices
98
+ + cocci: add headings to and reword README
99
129
- Leakfixes (subset)
100
+ Update documentation regarding Coccinelle patches.
101
+ source: <pull.1495.v2.git.git.1682634143.gitgitgadget@gmail.com>
102
131
- Will merge to 'next'.
132
- source: <9eb931e7-dd18-8ce8-4d4a-cf3d85066189@gmail.com>
103
104
+* jc/diff-s-with-other-options (2023-05-05) 1 commit
105
+ (merged to 'next' on 2023-05-20 at dda3826a68)
106
+ + diff: fix interaction between the "-s" option and other options
107
135
-* rs/run-command-exec-error-on-noent (2023-06-12) 2 commits
136
- - run-command: report exec error even on ENOENT
137
- - t1800: loosen matching of error message for bad shebang
108
+ The "-s" (silent, squelch) option of the "diff" family of commands
109
+ did not interact with other options that specify the output format
110
+ well. This has been cleaned up so that it will clear all the
111
+ formatting options given before.
112
+ source: <20230505165952.335256-1-gitster@pobox.com>
113
139
- Simplify error message when run-command fails to start a command.
114
141
- Will merge to 'next'.
142
- source: <14e1be60-3765-0ba5-00f5-2848bb57bf53@web.de>
115
+* jc/pack-ref-exclude-include (2023-05-12) 3 commits
116
+ (merged to 'next' on 2023-05-23 at 37333a2d00)
117
+ + pack-refs: teach pack-refs --include option
118
+ + pack-refs: teach --exclude option to exclude refs from being packed
119
+ + docs: clarify git-pack-refs --all will pack all refs
120
121
+ "git pack-refs" learns "--include" and "--exclude" to tweak the ref
122
+ hierarchy to be packed using pattern matching.
123
+ source: <pull.1501.v4.git.git.1683927282.gitgitgadget@gmail.com>
124
145
-* sl/worktree-sparse (2023-06-12) 1 commit
146
- - worktree: integrate with sparse-index
125
148
- "git worktree" learned to work better with sparse index feature.
126
+* jk/format-patch-message-id-unleak (2023-05-19) 2 commits
127
+ (merged to 'next' on 2023-05-23 at 44b9e1ab91)
128
+ + format-patch: free elements of rev.ref_message_ids list
129
+ + format-patch: free rev.message_id when exiting
130
150
- Will merge to 'next'.
151
- source: <20230606172633.669916-1-cheskaqiqi@gmail.com>
131
+ Leakfix.
132
+ source: <20230519000239.GA1975039@coredump.intra.peff.net>
133
134
154
-* tb/collect-pack-filenames-fix (2023-06-12) 1 commit
155
- - builtin/repack.c: only collect fully-formed packs
135
+* kh/keep-tag-editmsg-upon-failure (2023-05-16) 3 commits
136
+ (merged to 'next' on 2023-05-19 at fc0fe3173d)
137
+ + tag: keep the message file in case ref transaction fails
138
+ + t/t7004-tag: add regression test for successful tag creation
139
+ + doc: tag: document `TAG_EDITMSG`
140
157
- Avoid breakage of "git pack-objects --cruft" due to inconsistency
158
- between the way the code enumerates packfiles in the repository.
141
+ "git tag" learned to leave the "$GIT_DIR/TAG_EDITMSG" file when the
142
+ command failed, so that the user can salvage what they typed.
143
+ source: <cover.1684258780.git.code@khaugsbakk.name>
144
160
- Will merge to 'next'?
161
- source: <20230607101617.ges6tnMry4E52lDGld43QgtNUsIS4YQq6w-t71hEfkQ@z>
145
146
+* sa/doc-ls-remote (2023-05-19) 6 commits
147
+ (merged to 'next' on 2023-05-20 at d577bf75a0)
148
+ + ls-remote doc: document the output format
149
+ + ls-remote doc: explain what each example does
150
+ + ls-remote doc: show peeled tags in examples
151
+ + ls-remote doc: remove redundant --tags example
152
+ + show-branch doc: say <ref>, not <reference>
153
+ + show-ref doc: update for internal consistency
154
164
-* tb/open-midx-bitmap-fallback (2023-06-12) 1 commit
165
- - pack-bitmap.c: gracefully degrade on failure to load MIDX'd pack
155
+ Doc update.
156
+ source: <pull.1471.v4.git.git.1684469874.gitgitgadget@gmail.com>
157
167
- Gracefully deal with a stale MIDX file that lists a packfile that
168
- no longer exists.
158
170
- Will merge to 'next'.
171
- source: <f123b68cb8a277fbf105b1789a84b9405a499b79.1686178854.git.me@ttaylorr.com>
159
+* sl/diff-tree-sparse (2023-05-18) 1 commit
160
+ (merged to 'next' on 2023-05-24 at 5d4f2dec4d)
161
+ + diff-tree: integrate with sparse index
162
163
+ "git diff-tree" has been taught to take advantage of the
164
+ sparse-index feature.
165
+ cf. <2a2b7223-bb5d-65f9-95bb-9be45d329c87@github.com>
166
+ source: <20230518154454.475487-1-cheskaqiqi@gmail.com>
167
174
-* tz/lib-gpg-prereq-fix (2023-06-12) 1 commit
175
- - t/lib-gpg: require GPGSSH for GPGSSH_VERIFYTIME prereq
168
177
- Test update.
169
+* zh/ls-files-format-atoms (2023-05-23) 1 commit
170
+ (merged to 'next' on 2023-05-24 at 116b11effb)
171
+ + ls-files: align format atoms with ls-tree
172
179
- Will merge to 'next'.
180
- source: <20230606214707.55739-1-tmz@pobox.com>
173
+ Some atoms that can be used in "--format=<format>" for "git ls-tree"
174
+ were not supported by "git ls-files", even though they were relevant
175
+ in the context of the latter.
176
+ source: <pull.1533.v2.git.1684832418299.gitgitgadget@gmail.com>
177
178
--------------------------------------------------
179
[Stalled]
@@ -331,66 +327,200 @@ Release tarballs are available at:
327
--------------------------------------------------
328
[Cooking]
329
330
+* as/dtype-compilation-fix (2023-06-12) 1 commit
331
+ - statinfo.h: move DTYPE defines from dir.h
332
+
333
+ Compilation fix for platforms without D_TYPE in struct dirent.
334
+
335
+ Will merge to 'next'.
336
+ source: <20230606205935.3183276-1-asedeno@google.com>
337
+
338
+
339
+* la/docs-typofixes (2023-06-12) 1 commit
340
+ - docs: typofixes
341
+
342
+ Typofixes.
343
+
344
+ Will merge to 'next'.
345
+ source: <pull.1542.v2.git.1686166007816.gitgitgadget@gmail.com>
346
+
347
+
348
+* mh/mingw-case-sensitive-build (2023-06-12) 1 commit
349
+ - mingw: use lowercase includes for some Windows headers
350
+
351
+ Names of MinGW header files are spelled in mixed case in some
352
+ source files, but the build host can be using case sensitive
353
+ filesystem with header files with their name spelled in all
354
+ lowercase.
355
+
356
+ Needs review.
357
+ source: <20230604211934.1365289-1-mh@glandium.org>
358
+
359
+
360
+* pb/complete-diff-options (2023-06-12) 25 commits
361
+ - diff.c: mention completion above add_diff_options
362
+ - completion: complete --remerge-diff
363
+ - completion: complete --diff-merges, its options and --no-diff-merges
364
+ - completion: move --pickaxe-{all,regex} to __git_diff_common_options
365
+ - completion: complete --ws-error-highlight
366
+ - completion: complete --unified
367
+ - completion: complete --patch-with-raw
368
+ - completion: complete --output-indicator-{context,new,old}
369
+ - completion: complete --output
370
+ - completion: complete --no-stat
371
+ - completion: complete --no-relative
372
+ - completion: complete --line-prefix
373
+ - completion: complete --ita-invisible-in-index and --ita-visible-in-index
374
+ - completion: complete --irreversible-delete
375
+ - completion: complete --ignore-matching-lines
376
+ - completion: complete --function-context
377
+ - completion: complete --find-renames
378
+ - completion: complete --find-object
379
+ - completion: complete --find-copies
380
+ - completion: complete --default-prefix
381
+ - completion: complete --compact-summary
382
+ - completion: complete --combined-all-paths
383
+ - completion: complete --cc
384
+ - completion: complete --break-rewrites
385
+ - completion: add comments describing __git_diff_* globals
386
+
387
+ Completion updates.
388
+
389
+ Expecting a reroll.
390
+ cf. <5cba334c-4d75-0dac-20c6-9e3def1f224a@gmail.com>
391
+ source: <pull.1543.v2.git.1686574374.gitgitgadget@gmail.com>
392
+
393
+
394
+* rj/leakfixes (2023-06-12) 6 commits
395
+ - branch: fix a leak in setup_tracking
396
+ - branch: fix a leak in check_tracking_branch
397
+ - branch: fix a leak in inherit_tracking
398
+ - branch: fix a leak in dwim_and_setup_tracking
399
+ - remote: fix a leak in query_matches_negative_refspec
400
+ - config: fix a leak in git_config_copy_or_rename_section_in_file
401
+
402
+ Leakfixes (subset)
403
+
404
+ Will merge to 'next'.
405
+ source: <9eb931e7-dd18-8ce8-4d4a-cf3d85066189@gmail.com>
406
+
407
+
408
+* rs/run-command-exec-error-on-noent (2023-06-12) 2 commits
409
+ - run-command: report exec error even on ENOENT
410
+ - t1800: loosen matching of error message for bad shebang
411
+
412
+ Simplify error message when run-command fails to start a command.
413
+
414
+ Will merge to 'next'.
415
+ source: <14e1be60-3765-0ba5-00f5-2848bb57bf53@web.de>
416
+
417
+
418
+* sl/worktree-sparse (2023-06-12) 1 commit
419
+ - worktree: integrate with sparse-index
420
+
421
+ "git worktree" learned to work better with sparse index feature.
422
+
423
+ Will merge to 'next'.
424
+ source: <20230606172633.669916-1-cheskaqiqi@gmail.com>
425
+
426
+
427
+* tb/collect-pack-filenames-fix (2023-06-12) 1 commit
428
+ - builtin/repack.c: only collect fully-formed packs
429
+
430
+ Avoid breakage of "git pack-objects --cruft" due to inconsistency
431
+ between the way the code enumerates packfiles in the repository.
432
+
433
+ Will merge to 'next'?
434
+ source: <20230607101617.ges6tnMry4E52lDGld43QgtNUsIS4YQq6w-t71hEfkQ@z>
435
+
436
+
437
+* tb/open-midx-bitmap-fallback (2023-06-12) 1 commit
438
+ - pack-bitmap.c: gracefully degrade on failure to load MIDX'd pack
439
+
440
+ Gracefully deal with a stale MIDX file that lists a packfile that
441
+ no longer exists.
442
+
443
+ Will merge to 'next'.
444
+ source: <f123b68cb8a277fbf105b1789a84b9405a499b79.1686178854.git.me@ttaylorr.com>
445
+
446
+
447
+* tz/lib-gpg-prereq-fix (2023-06-12) 1 commit
448
+ - t/lib-gpg: require GPGSSH for GPGSSH_VERIFYTIME prereq
449
+
450
+ Test update.
451
+
452
+ Will merge to 'next'.
453
+ source: <20230606214707.55739-1-tmz@pobox.com>
454
+
455
+
456
* jk/ci-use-clang-for-sanitizer-jobs (2023-06-03) 3 commits
335
- - ci: drop linux-clang job
336
- - ci: run ASan/UBSan in a single job
337
- - ci: use clang for ASan/UBSan checks
457
+ (merged to 'next' on 2023-06-12 at f6d4c5aac6)
458
+ + ci: drop linux-clang job
459
+ + ci: run ASan/UBSan in a single job
460
+ + ci: use clang for ASan/UBSan checks
461
462
Clang's sanitizer implementation seems to work better than GCC's.
463
341
- Will merge to 'next'.
464
+ Will merge to 'master'.
465
source: <20230601180220.GA4167745@coredump.intra.peff.net>
466
467
468
* jk/log-follow-with-non-literal-pathspec (2023-06-03) 3 commits
346
- - diff: detect pathspec magic not supported by --follow
347
- - diff: factor out --follow pathspec check
348
- - pathspec: factor out magic-to-name function
469
+ (merged to 'next' on 2023-06-13 at 6c864e2f8a)
470
+ + diff: detect pathspec magic not supported by --follow
471
+ + diff: factor out --follow pathspec check
472
+ + pathspec: factor out magic-to-name function
473
474
"git [-c log.follow=true] log [--follow] ':(glob)f**'" used to barf.
475
352
- Will merge to 'next'.
476
+ Will merge to 'master'.
477
source: <20230601173724.GA4158369@coredump.intra.peff.net>
478
479
480
* kh/use-default-notes-doc (2023-06-06) 2 commits
357
- - notes: move the documentation to the struct
358
- - notes: update documentation for `use_default_notes`
481
+ (merged to 'next' on 2023-06-13 at ebfbf7a376)
482
+ + notes: move the documentation to the struct
483
+ + notes: update documentation for `use_default_notes`
484
360
- Will merge to 'next'.
485
+ Doc update.
486
+
487
+ Will merge to 'master'.
488
source: <cover.1685958731.git.code@khaugsbakk.name>
489
490
491
* ps/cat-file-null-output (2023-06-12) 5 commits
365
- - cat-file: add option '-Z' that delimits input and output with NUL
366
- - cat-file: simplify reading from standard input
367
- - strbuf: provide CRLF-aware helper to read until a specified delimiter
368
- - t1006: modernize test style to use `test_cmp`
369
- - t1006: don't strip timestamps from expected results
492
+ (merged to 'next' on 2023-06-14 at f879ffcbf0)
493
+ + cat-file: add option '-Z' that delimits input and output with NUL
494
+ + cat-file: simplify reading from standard input
495
+ + strbuf: provide CRLF-aware helper to read until a specified delimiter
496
+ + t1006: modernize test style to use `test_cmp`
497
+ + t1006: don't strip timestamps from expected results
498
499
"git cat-file --batch" and friends learned "-Z" that uses NUL
500
delimiter for both input and output.
501
374
- Will merge to 'next'.
502
+ Will merge to 'master'.
503
source: <cover.1686028409.git.ps@pks.im>
504
505
506
* tl/quote-problematic-arg-for-clarity (2023-06-03) 1 commit
379
- - surround %s with quotes when failed to lookup commit
507
+ (merged to 'next' on 2023-06-12 at 68851799e5)
508
+ + surround %s with quotes when failed to lookup commit
509
510
Error message fix.
511
383
- Will merge to 'next'.
512
+ Will merge to 'master'.
513
source: <1f7c62a8870433792076fae30d6c4dc4b61a00d8.1685366301.git.dyroneteng@gmail.com>
514
515
516
* ds/add-i-color-configuration-fix (2023-06-12) 2 commits
388
- - add: test use of brackets when color is disabled
389
- - add: check color.ui for interactive add
517
+ (merged to 'next' on 2023-06-14 at 91eec092e0)
518
+ + add: test use of brackets when color is disabled
519
+ + add: check color.ui for interactive add
520
521
The reimplemented "git add -i" did not honor color.ui configuration.
522
393
- Will merge to 'next'.
523
+ Will merge to 'master'.
524
source: <pull.1541.v2.git.1686061219078.gitgitgadget@gmail.com>
525
526
@@ -406,49 +536,54 @@ Release tarballs are available at:
536
537
538
* mh/commit-reach-get-reachable-plug-leak (2023-06-04) 1 commit
409
- - commit-reach: fix memory leak in get_reachable_subset()
539
+ (merged to 'next' on 2023-06-12 at 7c58973941)
540
+ + commit-reach: fix memory leak in get_reachable_subset()
541
542
Plug memory leak.
543
413
- Will merge to 'next'.
544
+ Will merge to 'master'.
545
source: <20230603002819.1122129-1-mh@glandium.org>
546
547
548
* ds/disable-replace-refs (2023-06-12) 3 commits
418
- - repository: create read_replace_refs setting
419
- - replace-objects: create wrapper around setting
420
- - repository: create disable_replace_refs()
549
+ (merged to 'next' on 2023-06-14 at 82ba5a6ffa)
550
+ + repository: create read_replace_refs setting
551
+ + replace-objects: create wrapper around setting
552
+ + repository: create disable_replace_refs()
553
(this branch uses tb/pack-bitmap-traversal-with-boundary.)
554
555
Introduce a mechanism to disable replace refs globally and per
556
repository.
557
426
- Will merge to 'next'.
558
+ Will merge to 'master'.
559
source: <pull.1537.v3.git.1686057877.gitgitgadget@gmail.com>
560
561
562
* tz/test-fix-pthreads-prereq (2023-05-26) 1 commit
431
- - trace2 tests: fix PTHREADS prereq
563
+ (merged to 'next' on 2023-06-12 at 82d9529f2c)
564
+ + trace2 tests: fix PTHREADS prereq
565
566
Test fix.
567
435
- Will merge to 'next'.
568
+ Will merge to 'master'.
569
source: <20230525031218.3554586-1-tmz@pobox.com>
570
571
572
* tz/test-ssh-verifytime-fix (2023-05-26) 1 commit
440
- - t/lib-gpg: fix ssh-keygen -Y check-novalidate with openssh-9.0
573
+ (merged to 'next' on 2023-06-12 at 3abad605d6)
574
+ + t/lib-gpg: fix ssh-keygen -Y check-novalidate with openssh-9.0
575
576
Test fix.
577
444
- Will merge to 'next'.
578
+ Will merge to 'master'.
579
source: <20230525031026.3554406-1-tmz@pobox.com>
580
581
582
* vd/worktree-config-is-per-repository (2023-05-26) 3 commits
449
- - repository: move 'repository_format_worktree_config' to repo scope
450
- - config: pass 'repo' directly to 'config_with_options()'
451
- - config: use gitdir to get worktree config
583
+ (merged to 'next' on 2023-06-13 at 339d281663)
584
+ + repository: move 'repository_format_worktree_config' to repo scope
585
+ + config: pass 'repo' directly to 'config_with_options()'
586
+ + config: use gitdir to get worktree config
587
588
The value of config.worktree is per-repository, but has been kept
589
in a singleton global variable per process. This has been OK as
@@ -459,44 +594,46 @@ Release tarballs are available at:
594
The global variable has been eliminated and made into a member in
595
the per-repository data structure.
596
462
- Will merge to 'next'.
597
+ Will merge to 'master'.
598
cf. <3145f4f3-7bd4-8a1b-4943-11b7d22b60c6@github.com>
599
cf. <kl6lr0qwno2q.fsf@chooglen-macbookpro.roam.corp.google.com>
600
source: <pull.1536.v2.git.1685064781.gitgitgadget@gmail.com>
601
602
603
* tb/submodule-null-deref-fix (2023-05-25) 1 commit
469
- - builtin/submodule--helper.c: handle missing submodule URLs
604
+ (merged to 'next' on 2023-06-13 at 5eb6a7948d)
605
+ + builtin/submodule--helper.c: handle missing submodule URLs
606
607
"git submodule" code trusted the data coming from the config (and
608
the in-tree .gitmodules file) too much without validating, leading
609
to NULL dereference if the user mucks with a repository (e.g.
610
submodule.<name>.url is removed). This has been corrected.
611
476
- Will merge to 'next'.
612
+ Will merge to 'master'.
613
source: <ae6cf3fa461b85e346f034371dae56a2790dfa20.1684957882.git.me@ttaylorr.com>
614
615
616
* jc/test-modernization-2 (2023-05-23) 10 commits
481
- - t9400-git-cvsserver-server: modernize test format
482
- - t9200-git-cvsexportcommit: modernize test format
483
- - t9104-git-svn-follow-parent: modernize test format
484
- - t9100-git-svn-basic: modernize test format
485
- - t7700-repack: modernize test format
486
- - t7600-merge: modernize test format
487
- - t7508-status: modernize test format
488
- - t7201-co: modernize test format
489
- - t7111-reset-table: modernize test format
490
- - t7110-reset-merge: modernize test format
617
+ (merged to 'next' on 2023-06-13 at e3ab8eea9a)
618
+ + t9400-git-cvsserver-server: modernize test format
619
+ + t9200-git-cvsexportcommit: modernize test format
620
+ + t9104-git-svn-follow-parent: modernize test format
621
+ + t9100-git-svn-basic: modernize test format
622
+ + t7700-repack: modernize test format
623
+ + t7600-merge: modernize test format
624
+ + t7508-status: modernize test format
625
+ + t7201-co: modernize test format
626
+ + t7111-reset-table: modernize test format
627
+ + t7110-reset-merge: modernize test format
628
(this branch uses jc/test-modernization.)
629
630
Test style updates.
631
495
- Will merge to 'next'.
632
+ Will merge to 'master'.
633
source: <pull.1514.git.git.1684599239.gitgitgadget@gmail.com>
634
635
499
-* jt/path-filter-fix (2023-06-12) 4 commits
636
+* jt/path-filter-fix (2023-06-13) 4 commits
637
- commit-graph: new filter ver. that fixes murmur3
638
- repo-settings: introduce commitgraph.changedPathsVersion
639
- t4216: test changed path filters with high bit paths
@@ -507,7 +644,7 @@ Release tarballs are available at:
644
bump the format version to 2.
645
646
Will merge to 'next'?
510
- source: <cover.1686251688.git.jonathantanmy@google.com>
647
+ source: <cover.1686677910.git.jonathantanmy@google.com>
648
649
650
* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
@@ -534,116 +671,68 @@ Release tarballs are available at:
671
672
673
* ps/fetch-cleanups (2023-05-17) 9 commits
537
- - fetch: use `fetch_config` to store "submodule.fetchJobs" value
538
- - fetch: use `fetch_config` to store "fetch.parallel" value
539
- - fetch: use `fetch_config` to store "fetch.recurseSubmodules" value
540
- - fetch: use `fetch_config` to store "fetch.showForcedUpdates" value
541
- - fetch: use `fetch_config` to store "fetch.pruneTags" value
542
- - fetch: use `fetch_config` to store "fetch.prune" value
543
- - fetch: pass through `fetch_config` directly
544
- - fetch: drop unneeded NULL-check for `remote_ref`
545
- - fetch: drop unused DISPLAY_FORMAT_UNKNOWN enum value
674
+ (merged to 'next' on 2023-06-12 at d15d335893)
675
+ + fetch: use `fetch_config` to store "submodule.fetchJobs" value
676
+ + fetch: use `fetch_config` to store "fetch.parallel" value
677
+ + fetch: use `fetch_config` to store "fetch.recurseSubmodules" value
678
+ + fetch: use `fetch_config` to store "fetch.showForcedUpdates" value
679
+ + fetch: use `fetch_config` to store "fetch.pruneTags" value
680
+ + fetch: use `fetch_config` to store "fetch.prune" value
681
+ + fetch: pass through `fetch_config` directly
682
+ + fetch: drop unneeded NULL-check for `remote_ref`
683
+ + fetch: drop unused DISPLAY_FORMAT_UNKNOWN enum value
684
685
Code clean-up.
686
549
- Will merge to 'next'.
687
+ Will merge to 'master'.
688
cf. <20230519002128.GD2442034@coredump.intra.peff.net>
689
source: <cover.1684324059.git.ps@pks.im>
690
691
554
-* sl/diff-tree-sparse (2023-05-18) 1 commit
555
- (merged to 'next' on 2023-05-24 at 5d4f2dec4d)
556
- + diff-tree: integrate with sparse index
557
-
558
- "git diff-tree" has been taught to take advantage of the
559
- sparse-index feature.
560
-
561
- Will merge to 'master'.
562
- cf. <2a2b7223-bb5d-65f9-95bb-9be45d329c87@github.com>
563
- source: <20230518154454.475487-1-cheskaqiqi@gmail.com>
564
-
565
-
566
-* jk/format-patch-message-id-unleak (2023-05-19) 2 commits
567
- (merged to 'next' on 2023-05-23 at 44b9e1ab91)
568
- + format-patch: free elements of rev.ref_message_ids list
569
- + format-patch: free rev.message_id when exiting
570
-
571
- Leakfix.
572
-
573
- Will merge to 'master'.
574
- source: <20230519000239.GA1975039@coredump.intra.peff.net>
575
-
576
-
692
* jc/test-modernization (2023-05-19) 20 commits
578
- - t7101-reset-empty-subdirs: modernize test format
579
- - t6050-replace: modernize test format
580
- - t5306-pack-nobase: modernize test format
581
- - t5303-pack-corruption-resilience: modernize test format
582
- - t5301-sliding-window: modernize test format
583
- - t5300-pack-object: modernize test format
584
- - t4206-log-follow-harder-copies: modernize test format
585
- - t4202-log: modernize test format
586
- - t4004-diff-rename-symlink: modernize test format
587
- - t4003-diff-rename-1: modernize test format
588
- - t4002-diff-basic: modernize test format
589
- - t3903-stash: modernize test format
590
- - t3700-add: modernize test format
591
- - t3500-cherry: modernize test format
592
- - t1006-cat-file: modernize test format
593
- - t1002-read-tree-m-u-2way: modernize test format
594
- - t1001-read-tree-m-2way: modernize test format
595
- - t3210-pack-refs: modernize test format
596
- - t0030-stripspace: modernize test format
597
- - t0000-basic: modernize test format
693
+ (merged to 'next' on 2023-06-13 at a61e7b7248)
694
+ + t7101-reset-empty-subdirs: modernize test format
695
+ + t6050-replace: modernize test format
696
+ + t5306-pack-nobase: modernize test format
697
+ + t5303-pack-corruption-resilience: modernize test format
698
+ + t5301-sliding-window: modernize test format
699
+ + t5300-pack-object: modernize test format
700
+ + t4206-log-follow-harder-copies: modernize test format
701
+ + t4202-log: modernize test format
702
+ + t4004-diff-rename-symlink: modernize test format
703
+ + t4003-diff-rename-1: modernize test format
704
+ + t4002-diff-basic: modernize test format
705
+ + t3903-stash: modernize test format
706
+ + t3700-add: modernize test format
707
+ + t3500-cherry: modernize test format
708
+ + t1006-cat-file: modernize test format
709
+ + t1002-read-tree-m-u-2way: modernize test format
710
+ + t1001-read-tree-m-2way: modernize test format
711
+ + t3210-pack-refs: modernize test format
712
+ + t0030-stripspace: modernize test format
713
+ + t0000-basic: modernize test format
714
(this branch is used by jc/test-modernization-2.)
715
600
- Will merge to 'next'.
716
+ Will merge to 'master'.
717
source: <pull.1513.git.git.1684440205.gitgitgadget@gmail.com>
718
719
720
* ja/worktree-orphan (2023-05-17) 8 commits
605
- - worktree add: emit warn when there is a bad HEAD
606
- - worktree add: extend DWIM to infer --orphan
607
- - worktree add: introduce "try --orphan" hint
608
- - worktree add: add --orphan flag
609
- - t2400: add tests to verify --quiet
610
- - t2400: refactor "worktree add" opt exclusion tests
611
- - t2400: cleanup created worktree in test
612
- - worktree add: include -B in usage docs
721
+ (merged to 'next' on 2023-06-14 at 25d508496b)
722
+ + worktree add: emit warn when there is a bad HEAD
723
+ + worktree add: extend DWIM to infer --orphan
724
+ + worktree add: introduce "try --orphan" hint
725
+ + worktree add: add --orphan flag
726
+ + t2400: add tests to verify --quiet
727
+ + t2400: refactor "worktree add" opt exclusion tests
728
+ + t2400: cleanup created worktree in test
729
+ + worktree add: include -B in usage docs
730
731
'git worktree add' learned how to create a worktree based on an
732
orphaned branch with `--orphan`.
733
617
- Will merge to 'next'.
618
- source: <20230517214711.12467-1-jacobabel@nullpo.dev>
619
-
620
-
621
-* kh/keep-tag-editmsg-upon-failure (2023-05-16) 3 commits
622
- (merged to 'next' on 2023-05-19 at fc0fe3173d)
623
- + tag: keep the message file in case ref transaction fails
624
- + t/t7004-tag: add regression test for successful tag creation
625
- + doc: tag: document `TAG_EDITMSG`
626
-
627
- "git tag" learned to leave the "$GIT_DIR/TAG_EDITMSG" file when the
628
- command failed, so that the user can salvage what they typed.
629
-
734
Will merge to 'master'.
631
- source: <cover.1684258780.git.code@khaugsbakk.name>
632
-
633
-
634
-* sa/doc-ls-remote (2023-05-19) 6 commits
635
- (merged to 'next' on 2023-05-20 at d577bf75a0)
636
- + ls-remote doc: document the output format
637
- + ls-remote doc: explain what each example does
638
- + ls-remote doc: show peeled tags in examples
639
- + ls-remote doc: remove redundant --tags example
640
- + show-branch doc: say <ref>, not <reference>
641
- + show-ref doc: update for internal consistency
642
-
643
- Doc update.
644
-
645
- Will merge to 'master'.
646
- source: <pull.1471.v4.git.git.1684469874.gitgitgadget@gmail.com>
735
+ source: <20230517214711.12467-1-jacobabel@nullpo.dev>
736
737
738
* tb/refs-exclusion-and-packed-refs (2023-06-12) 16 commits
@@ -666,73 +755,62 @@ Release tarballs are available at:
755
756
Enumerating refs in the packed-refs file, while excluding refs that
757
match certain patterns, has been optimized.
669
-
758
source: <cover.1686134440.git.me@ttaylorr.com>
759
760
673
-* zh/ls-files-format-atoms (2023-05-23) 1 commit
674
- (merged to 'next' on 2023-05-24 at 116b11effb)
675
- + ls-files: align format atoms with ls-tree
676
-
677
- Some atoms that can be used in "--format=<format>" for "git ls-tree"
678
- were not supported by "git ls-files", even though they were relevant
679
- in the context of the latter.
680
-
681
- Will merge to 'master'.
682
- source: <pull.1533.v2.git.1684832418299.gitgitgadget@gmail.com>
683
-
684
-
761
* en/header-split-cache-h-part-3 (2023-05-16) 29 commits
686
- - fsmonitor-ll.h: split this header out of fsmonitor.h
687
- - hash-ll, hashmap: move oidhash() to hash-ll
688
- - object-store-ll.h: split this header out of object-store.h
689
- - khash: name the structs that khash declares
690
- - merge-ll: rename from ll-merge
691
- - git-compat-util.h: remove unneccessary include of wildmatch.h
692
- - builtin.h: remove unneccessary includes
693
- - list-objects-filter-options.h: remove unneccessary include
694
- - diff.h: remove unnecessary include of oidset.h
695
- - repository: remove unnecessary include of path.h
696
- - log-tree: replace include of revision.h with simple forward declaration
697
- - cache.h: remove this no-longer-used header
698
- - read-cache*.h: move declarations for read-cache.c functions from cache.h
699
- - repository.h: move declaration of the_index from cache.h
700
- - merge.h: move declarations for merge.c from cache.h
701
- - diff.h: move declaration for global in diff.c from cache.h
702
- - preload-index.h: move declarations for preload-index.c from elsewhere
703
- - sparse-index.h: move declarations for sparse-index.c from cache.h
704
- - name-hash.h: move declarations for name-hash.c from cache.h
705
- - run-command.h: move declarations for run-command.c from cache.h
706
- - statinfo: move stat_{data,validity} functions from cache/read-cache
707
- - read-cache: move shared add/checkout/commit code
708
- - add: modify add_files_to_cache() to avoid globals
709
- - read-cache: move shared commit and ls-files code
710
- - setup: adopt shared init-db & clone code
711
- - init-db, clone: change unnecessary global into passed parameter
712
- - init-db: remove unnecessary global variable
713
- - init-db: document existing bug with core.bare in template config
714
- - Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-part-3
762
+ (merged to 'next' on 2023-06-13 at 56bcca52ac)
763
+ + fsmonitor-ll.h: split this header out of fsmonitor.h
764
+ + hash-ll, hashmap: move oidhash() to hash-ll
765
+ + object-store-ll.h: split this header out of object-store.h
766
+ + khash: name the structs that khash declares
767
+ + merge-ll: rename from ll-merge
768
+ + git-compat-util.h: remove unneccessary include of wildmatch.h
769
+ + builtin.h: remove unneccessary includes
770
+ + list-objects-filter-options.h: remove unneccessary include
771
+ + diff.h: remove unnecessary include of oidset.h
772
+ + repository: remove unnecessary include of path.h
773
+ + log-tree: replace include of revision.h with simple forward declaration
774
+ + cache.h: remove this no-longer-used header
775
+ + read-cache*.h: move declarations for read-cache.c functions from cache.h
776
+ + repository.h: move declaration of the_index from cache.h
777
+ + merge.h: move declarations for merge.c from cache.h
778
+ + diff.h: move declaration for global in diff.c from cache.h
779
+ + preload-index.h: move declarations for preload-index.c from elsewhere
780
+ + sparse-index.h: move declarations for sparse-index.c from cache.h
781
+ + name-hash.h: move declarations for name-hash.c from cache.h
782
+ + run-command.h: move declarations for run-command.c from cache.h
783
+ + statinfo: move stat_{data,validity} functions from cache/read-cache
784
+ + read-cache: move shared add/checkout/commit code
785
+ + add: modify add_files_to_cache() to avoid globals
786
+ + read-cache: move shared commit and ls-files code
787
+ + setup: adopt shared init-db & clone code
788
+ + init-db, clone: change unnecessary global into passed parameter
789
+ + init-db: remove unnecessary global variable
790
+ + init-db: document existing bug with core.bare in template config
791
+ + Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-part-3
792
793
Header files cleanup.
794
718
- Will merge to 'next'.
795
+ Will merge to 'master'.
796
source: <pull.1525.v3.git.1684218848.gitgitgadget@gmail.com>
797
798
799
* la/doc-interpret-trailers (2023-06-12) 9 commits
723
- - doc: trailer: add more examples in DESCRIPTION
724
- - doc: trailer: mention 'key' in DESCRIPTION
725
- - doc: trailer.<token>.command: emphasize deprecation
726
- - doc: trailer: use angle brackets for <token> and <value>
727
- - doc: trailer: remove redundant phrasing
728
- - doc: trailer: examples: avoid the word "message" by itself
729
- - doc: trailer: drop "commit message part" phrasing
730
- - doc: trailer: swap verb order
731
- - doc: trailer: fix grammar
800
+ (merged to 'next' on 2023-06-14 at 64a59e71b3)
801
+ + doc: trailer: add more examples in DESCRIPTION
802
+ + doc: trailer: mention 'key' in DESCRIPTION
803
+ + doc: trailer.<token>.command: emphasize deprecation
804
+ + doc: trailer: use angle brackets for <token> and <value>
805
+ + doc: trailer: remove redundant phrasing
806
+ + doc: trailer: examples: avoid the word "message" by itself
807
+ + doc: trailer: drop "commit message part" phrasing
808
+ + doc: trailer: swap verb order
809
+ + doc: trailer: fix grammar
810
811
Doc update.
812
735
- Will merge to 'next'.
813
+ Will merge to 'master'.
814
source: <pull.1506.v3.git.git.1686017304.gitgitgadget@gmail.com>
815
816
@@ -756,19 +834,6 @@ Release tarballs are available at:
834
source: <20230602102533.876905-1-christian.couder@gmail.com>
835
836
759
-* jc/pack-ref-exclude-include (2023-05-12) 3 commits
760
- (merged to 'next' on 2023-05-23 at 37333a2d00)
761
- + pack-refs: teach pack-refs --include option
762
- + pack-refs: teach --exclude option to exclude refs from being packed
763
- + docs: clarify git-pack-refs --all will pack all refs
764
-
765
- "git pack-refs" learns "--include" and "--exclude" to tweak the ref
766
- hierarchy to be packed using pattern matching.
767
-
768
- Will merge to 'master'.
769
- source: <pull.1501.v4.git.git.1683927282.gitgitgadget@gmail.com>
770
-
771
-
837
* tb/gc-recent-object-hook (2023-06-12) 2 commits
838
- gc: introduce `gc.recentObjectsHook`
839
- reachable.c: extract `obj_is_recent()`
@@ -781,19 +846,6 @@ Release tarballs are available at:
846
source: <cover.1686178684.git.me@ttaylorr.com>
847
848
784
-* jc/diff-s-with-other-options (2023-05-05) 1 commit
785
- (merged to 'next' on 2023-05-20 at dda3826a68)
786
- + diff: fix interaction between the "-s" option and other options
787
-
788
- The "-s" (silent, squelch) option of the "diff" family of commands
789
- did not interact with other options that specify the output format
790
- well. This has been cleaned up so that it will clear all the
791
- formatting options given before.
792
-
793
- Will merge to 'master'.
794
- source: <20230505165952.335256-1-gitster@pobox.com>
795
-
796
-
849
* ob/revert-of-revert (2023-05-05) 1 commit
850
- sequencer: beautify subject of reverts of reverts
851
@@ -816,7 +868,6 @@ Release tarballs are available at:
868
869
Move functions that are not about pure string manipulation out of
870
strbuf.[ch]
819
-
871
source: <20230606194720.2053551-1-calvinwan@google.com>
872
873
@@ -828,11 +879,12 @@ Release tarballs are available at:
879
+ t3321: add test cases about the notes stripspace behavior
880
+ notes.c: use designated initializers for clarity
881
+ notes.c: cleanup 'strbuf_grow' call in 'append_edit'
882
+ (this branch is used by jc/notes-separator-fix.)
883
884
'git notes append' was taught '--separator' to specify string to insert
885
between paragraphs.
886
835
- On hold.
887
+ Will merge to 'next' together with its fix-up.
888
source: <cover.1682671758.git.dyroneteng@gmail.com>
889
890
@@ -854,9 +906,9 @@ Release tarballs are available at:
906
907
908
* tb/pack-bitmap-traversal-with-boundary (2023-05-08) 3 commits
857
- - pack-bitmap.c: use commit boundary during bitmap traversal
858
- - pack-bitmap.c: extract `fill_in_bitmap()`
859
- - object: add object_array initializer helper function
909
+ + pack-bitmap.c: use commit boundary during bitmap traversal
910
+ + pack-bitmap.c: extract `fill_in_bitmap()`
911
+ + object: add object_array initializer helper function
912
(this branch is used by ds/disable-replace-refs.)
913
914
The object traversal using reachability bitmap done by
@@ -868,29 +920,19 @@ Release tarballs are available at:
920
source: <cover.1683567065.git.me@ttaylorr.com>
921
922
871
-* gc/doc-cocci-updates (2023-04-27) 2 commits
872
- (merged to 'next' on 2023-05-20 at 3fe237c1a8)
873
- + cocci: codify authoring and reviewing practices
874
- + cocci: add headings to and reword README
875
-
876
- Update documentation regarding Coccinelle patches.
877
-
878
- Will merge to 'master'.
879
- source: <pull.1495.v2.git.git.1682634143.gitgitgadget@gmail.com>
880
-
881
-
923
* pb/complete-and-document-auto-merge-and-friends (2023-05-23) 6 commits
883
- - completion: complete AUTO_MERGE
884
- - Documentation: document AUTO_MERGE
885
- - git-merge.txt: modernize word choice in "True merge" section
886
- - completion: complete REVERT_HEAD and BISECT_HEAD
887
- - revisions.txt: document more special refs
888
- - revisions.txt: use description list for special refs
924
+ (merged to 'next' on 2023-06-13 at 46ca10d88d)
925
+ + completion: complete AUTO_MERGE
926
+ + Documentation: document AUTO_MERGE
927
+ + git-merge.txt: modernize word choice in "True merge" section
928
+ + completion: complete REVERT_HEAD and BISECT_HEAD
929
+ + revisions.txt: document more special refs
930
+ + revisions.txt: use description list for special refs
931
932
Document more pseudo-refs and teach the command line completion
933
machinery to complete AUTO_MERGE.
934
893
- Will merge to 'next'.
935
+ Will merge to 'master'.
936
source: <pull.1515.v2.git.1684783741.gitgitgadget@gmail.com>
937
938
@@ -905,16 +947,3 @@ Release tarballs are available at:
947
The database gets littered with entries whose expiration dates only differ.
948
cf. <CAGJzqskMwOJkriH6serqdwAVYi+fftEL8ohJd-suP6v+OxB_bg@mail.gmail.com>
949
source: <pull.1469.v3.git.git.1683270298313.gitgitgadget@gmail.com>
908
-
909
---------------------------------------------------
910
-[Discarded]
911
-
912
-* tc/cat-file-z-use-cquote (2023-05-10) 1 commit
913
- . cat-file: quote-format name in error when using -z
914
-
915
- "cat-file" in the batch mode that is fed NUL-terminated pathnames
916
- learned to cquote them in its error output (otherwise, a funny
917
- pathname with LF in it would break the lines in the output stream).
918
-
919
- Superseded by the ps/cat-file-null-output topic.
920
- source: <20230510190116.795641-2-toon@iotcl.com>