What's cooking (2022/10 #05)
Junio C Hamano committed
Oct 17, 2022 at 15:29 UTC
adf780e00d2e7285234e363f6b091f60625fe1f5
1 file changed
+292
-287
whats-cooking.txt
+292
-287
@@ -1,9 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2022, #04; Wed, 12)
3
-X-master-at: d420dda0576340909c3faff364cfbd1485f70376
4
-X-next-at: 000bd34796a7971322b88e0157682adcb79b6cda
2
+Subject: What's cooking in git.git (Oct 2022, #05; Mon, 17)
3
+Bcc: lwn@lwn.net
4
+X-master-at: 4732897cf0a255a23dca9e97b65cea40cd06c5a8
5
+X-next-at: dd413c855b302a56aeac19873e6e9185f4eb5395
6
6
-What's cooking in git.git (Oct 2022, #04; Wed, 12)
7
+What's cooking in git.git (Oct 2022, #05; Mon, 17)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -13,14 +14,8 @@ release). Commits prefixed with '-' are only in 'seen', and aren't
14
considered "accepted" at all. A topic without enough support may be
15
discarded after a long period of no activity.
16
16
-The tip of 'next' has been rewound, after most of the topics that
17
-have been cooking during the last weeks of the previous round
18
-graduated to the 'master' branch. The topics in these early batches
19
-are mostly minor fixes, which might someday become part of the
20
-2.38.x maintenance track, but they need to be on 'master' for a few
21
-weeks before that happens. Some topics outside 'next' have been
22
-expecting updates for too long and we may want to discard them,
23
-unless they see some activities.
17
+Some topics outside 'next' have been expecting updates for too long
18
+and we may want to discard them, unless they see some activities.
19
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
@@ -53,109 +48,201 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
56
-* ds/bundle-uri-docfix (2022-10-07) 1 commit
57
- (merged to 'next' on 2022-10-07 at 9ebc1e497a)
58
- + bundle-uri: fix technical doc issues
51
+* ab/unused-annotation (2022-10-05) 1 commit
52
+ (merged to 'next' on 2022-10-11 at c3099ad3ab)
53
+ + git-compat-util.h: GCC deprecated message arg only in GCC 4.5+
54
60
- Doc formatting fix.
61
- source: <pull.1377.git.1665157810025.gitgitgadget@gmail.com>
55
+ Compilation fix for ancient compilers.
56
+ source: <20221005221928.703750-1-asedeno@google.com>
57
58
64
-* jk/sequencer-missing-author-name-check (2022-10-03) 1 commit
65
- (merged to 'next' on 2022-10-07 at 6a9f7e8b80)
66
- + sequencer: detect author name errors in read_author_script()
59
+* dd/document-runtime-prefix-better (2022-10-05) 1 commit
60
+ (merged to 'next' on 2022-10-11 at 9f4a3bb7bd)
61
+ + Makefile: clarify runtime relative gitexecdir
62
68
- Typofix in code.
69
- source: <YzsdRuD2CdJFdNVG@coredump.intra.peff.net>
63
+ Update comment in the Makefile about the RUNTIME_PREFIX config knob.
64
+ source: <20221006013205.15015-1-congdanhqx@gmail.com>
65
66
72
-* nb/doc-mergetool-typofix (2022-10-05) 1 commit
73
- (merged to 'next' on 2022-10-07 at d309a9a130)
74
- + mergetool.txt: typofix 'overwriten' -> 'overwritten'
67
+* ed/fsmonitor-on-networked-macos (2022-10-10) 7 commits
68
+ (merged to 'next' on 2022-10-11 at 32076d13b7)
69
+ + fsmonitor: fix leak of warning message
70
+ + fsmonitor: add documentation for allowRemote and socketDir options
71
+ + fsmonitor: check for compatability before communicating with fsmonitor
72
+ + fsmonitor: deal with synthetic firmlinks on macOS
73
+ + fsmonitor: avoid socket location check if using hook
74
+ + fsmonitor: relocate socket file if .git directory is remote
75
+ + fsmonitor: refactor filesystem checks to common interface
76
+ (this branch is used by ed/fsmonitor-inotify.)
77
76
- Typofix.
77
- source: <pull.1350.git.git.1664844924663.gitgitgadget@gmail.com>
78
+ By default, use of fsmonitor on a repository on networked
79
+ filesystem is disabled. Add knobs to make it workable on macOS.
80
+ source: <pull.1326.v15.git.1664904751.gitgitgadget@gmail.com>
81
82
80
-* pw/mailinfo-b-fix (2022-10-03) 1 commit
81
- (merged to 'next' on 2022-10-07 at 5c5d79daef)
82
- + mailinfo -b: fix an out of bounds access
83
+* jc/branch-description-unset (2022-09-30) 1 commit
84
+ (merged to 'next' on 2022-10-11 at 3f81ee978b)
85
+ + branch: do not fail a no-op --edit-desc
86
84
- Fix a logic in "mailinfo -b" that miscomputed the length of a
85
- substring, which lead to an out-of-bounds access.
86
- source: <pull.1372.git.1664789011089.gitgitgadget@gmail.com>
87
+ "GIT_EDITOR=: git branch --edit-description" resulted in failure,
88
+ which has been corrected.
89
+ source: <xmqqmtagka8x.fsf@gitster.g>
90
91
89
-* pw/ssh-sign-report-errors (2022-10-05) 1 commit
90
- (merged to 'next' on 2022-10-07 at 4df1d2379a)
91
- + ssh signing: return an error when signature cannot be read
92
+* jc/tmp-objdir (2022-09-30) 1 commit
93
+ (merged to 'next' on 2022-10-11 at 17d0843c43)
94
+ + tmp-objdir: skip clean up when handling a signal
95
93
- The codepath to sign learned to report errors when it fails to read
94
- from "ssh-keygen".
95
- source: <pull.1371.v2.git.1664877694430.gitgitgadget@gmail.com>
96
+ The code to clean temporary object directories (used for
97
+ quarantine) tried to remove them inside its signal handler, which
98
+ was a no-no.
99
+ source: <pull.1348.v4.git.git.1664570831583.gitgitgadget@gmail.com>
100
101
98
-* rs/gc-pack-refs-simplify (2022-10-05) 1 commit
99
- (merged to 'next' on 2022-10-07 at ef7d12408d)
100
- + gc: simplify maintenance_task_pack_refs()
102
+* jc/use-of-uc-in-log-messages (2022-10-07) 1 commit
103
+ (merged to 'next' on 2022-10-11 at 0b8c91d7e2)
104
+ + SubmittingPatches: use usual capitalization in the log message body
105
+
106
+ Clarify that "the sentence after <area>: prefix does not begin with
107
+ a capital letter" rule applies only to the commit title.
108
+ source: <xmqqedvjfqx1.fsf@gitster.g>
109
+
110
+
111
+* jk/cleanup-callback-parameters (2022-10-06) 4 commits
112
+ (merged to 'next' on 2022-10-11 at a3350d66b6)
113
+ + attr: drop DEBUG_ATTR code
114
+ + commit: avoid writing to global in option callback
115
+ + multi-pack-index: avoid writing to global in option callback
116
+ + test-submodule: inline resolve_relative_url() function
117
118
Code clean-up.
103
- source: <ab33f72e-d552-7bd7-bf04-3c476d32b5b6@web.de>
119
+ source: <Yz7Tjy7Rh8cXVxYQ@coredump.intra.peff.net>
120
+ source: <Yz7UhYXvNl6+1GbZ@coredump.intra.peff.net>
121
+
122
+
123
+* jt/promisor-remote-fetch-tweak (2022-10-05) 2 commits
124
+ (merged to 'next' on 2022-10-11 at e93567bc8f)
125
+ + promisor-remote: die upon failing fetch
126
+ + promisor-remote: remove a return value
127
128
+ Remove error detection from a function that fetches from promisor
129
+ remotes, and make it die when such a fetch fails to bring all the
130
+ requested objects, to give an early failure to various operations.
131
+ source: <cover.1664917853.git.jonathantanmy@google.com>
132
+
133
+
134
+* pw/remove-rebase-p-test (2022-10-10) 1 commit
135
+ (merged to 'next' on 2022-10-11 at 000bd34796)
136
+ + t3435: remove redundant test case
137
+
138
+ Remove outdated test.
139
+ source: <pull.1379.git.1665395106351.gitgitgadget@gmail.com>
140
106
-* rs/test-httpd-in-C-locale (2022-10-06) 1 commit
107
- (merged to 'next' on 2022-10-07 at 832c1e856a)
108
- + t/lib-httpd: pass LANG and LC_ALL to Apache
141
110
- Force C locale while running tests around httpd to make sure we can
111
- find expected error messages in the log.
112
- source: <a1699375-c660-13ab-42fb-26a8afe4c376@web.de>
142
+* rj/branch-edit-desc-unborn (2022-10-07) 1 commit
143
+ (merged to 'next' on 2022-10-11 at de3eccde7c)
144
+ + branch: description for non-existent branch errors
145
+
146
+ "git branch --edit-description" on an unborh branch misleadingly
147
+ said that no such branch exists, which has been corrected.
148
+ source: <8d627a2c-923f-181f-a03b-15f370c4dd0f@gmail.com>
149
+
150
+
151
+* rs/bisect-start-leakfix (2022-10-07) 1 commit
152
+ (merged to 'next' on 2022-10-11 at 07f87534c1)
153
+ + bisect--helper: plug strvec leak
154
+
155
+ Code clean-up that results in plugging a leak.
156
+ source: <1965b54b-122a-c965-f886-1a7dd6afbfb4@web.de>
157
+
158
+
159
+* rs/use-fspathncmp (2022-10-08) 1 commit
160
+ (merged to 'next' on 2022-10-11 at 11cbd1ce81)
161
+ + dir: use fspathncmp() in pl_hashmap_cmp()
162
+
163
+ Code clean-up.
164
+ source: <cb6ffcdb-d719-7928-96b8-e46482dd141f@web.de>
165
166
--------------------------------------------------
167
[New Topics]
168
117
-* ab/grep-simplify-extended-expression (2022-10-11) 1 commit
118
- - grep.c: remove "extended" in favor of "pattern_expression", fix segfault
169
+* gc/bare-repo-discovery (2022-10-13) 1 commit
170
+ (merged to 'next' on 2022-10-17 at 3de2be7c14)
171
+ + config: respect includes in protected config
172
120
- Giving "--invert-grep" and "--all-match" without "--grep" to the
121
- "git log" command resulted in an attempt to access grep pattern
122
- expression structure that has not been allocated, which has been
123
- corrected.
173
+ Allow configuration files in "protected" scopes to include other
174
+ configuration files.
175
125
- Will merge to 'next'.
126
- source: <patch-v2-1.1-6ad7627706f-20221011T094715Z-avarab@gmail.com>
176
+ Will merge to 'master'.
177
+ source: <pull.1360.v2.git.git.1665683027912.gitgitgadget@gmail.com>
178
179
129
-* rs/archive-dedup-printf (2022-10-11) 1 commit
130
- - archive: deduplicate verbose printing
180
+* jh/trace2-timers-and-counters (2022-10-13) 7 commits
181
+ - trace2: add global counter mechanism
182
+ - trace2: add stopwatch timers
183
+ - trace2: convert ctx.thread_name from strbuf to pointer
184
+ - trace2: rename the thread_name argument to trace2_thread_start
185
+ - api-trace2.txt: elminate section describing the public trace2 API
186
+ - tr2tls: clarify TLS terminology
187
+ - trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx
188
132
- Code simplification.
189
+ Two new facilities, "timer" and "counter", are introduced to the
190
+ trace2 API.
191
+ source: <pull.1373.v2.git.1665600750.gitgitgadget@gmail.com>
192
+
193
+
194
+* tb/midx-bitmap-selection-fix (2022-10-13) 4 commits
195
+ - pack-bitmap-write.c: instrument number of reused bitmaps
196
+ - midx.c: instrument MIDX and bitmap generation with trace2 regions
197
+ - midx.c: consider annotated tags during bitmap selection
198
+ - midx.c: fix whitespace typo
199
+
200
+ A bugfix with tracing support in midx codepath
201
202
Will merge to 'next'.
135
- source: <af5611aa-8662-7508-4f00-7fcf4e9cbcc6@web.de>
203
+ source: <cover.1665612094.git.me@ttaylorr.com>
204
205
138
-* pw/rebase-reflog-fixes (2022-10-12) 9 commits
139
- - rebase: cleanup action handling
140
- - rebase --abort: improve reflog message
141
- - rebase --apply: make reflog messages match rebase --merge
142
- - rebase --apply: respect GIT_REFLOG_ACTION
143
- - rebase --merge: fix reflog message after skipping
144
- - rebase --merge: fix reflog when continuing
145
- - t3406: rework rebase reflog tests
146
- - rebase --apply: remove duplicated code
147
- - Merge branch 'pw/rebase-keep-base-fixes' into pw/rebase-reflog-fixes
148
- (this branch uses pw/rebase-keep-base-fixes.)
206
+* tb/remove-unused-pack-bitmap (2022-10-13) 1 commit
207
+ - builtin/repack.c: remove redundant pack-based bitmaps
208
150
- source: <pull.1150.v3.git.1665567312.gitgitgadget@gmail.com>
209
+ When creating a multi-pack bitmap, remove per-pack bitmap files
210
+ unconditionally as they will never be consulted.
211
212
+ Will merge to 'next'?
213
+ source: <393fd4c6db78cd694e6d4dfcf24f17e2850ccd99.1665601403.git.me@ttaylorr.com>
214
153
-* sd/doc-smtp-encryption (2022-10-12) 1 commit
154
- - docs: git-send-email: difference between ssl and tls smtp-encryption
215
156
- Expecting a reroll??
157
- cf. <19e5b678-6014-d783-347f-9169371aaa09@iee.email>
158
- source: <20221012150619.12877-1-sndanailov@wired4ever.net>
216
+* nw/t1002-cleanup (2022-10-14) 1 commit
217
+ - t1002: modernize outdated conditional
218
+
219
+ source: <pull.1362.v3.git.git.1665734502591.gitgitgadget@gmail.com>
220
+
221
+
222
+* zh/patch-id (2022-10-14) 7 commits
223
+ - documentation: format-patch: clarify requirements for patch-ids to match
224
+ - builtin: patch-id: remove unused diff-tree prefix
225
+ - builtin: patch-id: add --include-whitespace as a command mode
226
+ - patch-id: fix patch-id for mode changes
227
+ - builtin: patch-id: fix patch-id with binary diffs
228
+ - patch-id: use stable patch-id for rebases
229
+ - patch-id: fix stable patch id for binary / header-only
230
+
231
+ source: <pull.1359.v3.git.1665737804.gitgitgadget@gmail.com>
232
+
233
+
234
+* hl/archive-recursive (2022-10-16) 9 commits
235
+ - archive: add tests for git archive --recurse-submodules
236
+ - archive: add --recurse-submodules to git-archive command
237
+ - archive: remove global repository from archive_args
238
+ - archive: pass repo objects to write_archive handlers
239
+ - tree: add repository parameter to read_tree_fn_t
240
+ - tree: handle submodule case for read_tree_at properly
241
+ - tree: increase test coverage for tree.c
242
+ - tree: update cases to use repo_ tree methods
243
+ - tree: do not use the_repository for tree traversal methods.
244
+
245
+ source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com>
246
247
--------------------------------------------------
248
[Stalled]
@@ -197,28 +284,6 @@ Release tarballs are available at:
284
source: <pull.1282.git.1657385781.gitgitgadget@gmail.com>
285
286
200
-* pw/rebase-keep-base-fixes (2022-09-07) 7 commits
201
- - rebase --keep-base: imply --no-fork-point
202
- - rebase --keep-base: imply --reapply-cherry-picks
203
- - rebase: factor out branch_base calculation
204
- - rebase: rename merge_base to branch_base
205
- - rebase: store orig_head as a commit
206
- - t3416: set $EDITOR in subshell
207
- - t3416: tighten two tests
208
- (this branch is used by pw/rebase-reflog-fixes.)
209
-
210
- "git rebase --keep-base" used to discard the commits that are
211
- already cherry-picked to the upstream, even when "keep-base" meant
212
- that the base, on top of which the history is being rebuilt, does
213
- not yet include these cherry-picked commits. The --keep-base
214
- option now implies --reapply-cherry-picks and --no-fork-point
215
- options.
216
-
217
- Expecting a reroll.
218
- cf. <e25127f3-6135-b716-a12f-5dbe4f40dc42@gmail.com>
219
- source: <pull.1323.v2.git.1662561470.gitgitgadget@gmail.com>
220
-
221
-
287
* js/cmake-updates (2022-08-24) 5 commits
288
- cmake: increase time-out for a long-running test
289
- cmake: avoid editing t/test-lib.sh
@@ -335,22 +400,97 @@ Release tarballs are available at:
400
--------------------------------------------------
401
[Cooking]
402
403
+* pw/rebase-keep-base-fixes (2022-10-17) 8 commits
404
+ - rebase --keep-base: imply --no-fork-point
405
+ - rebase --keep-base: imply --reapply-cherry-picks
406
+ - rebase: factor out branch_base calculation
407
+ - rebase: rename merge_base to branch_base
408
+ - rebase: store orig_head as a commit
409
+ - rebase: be stricter when reading state files containing oids
410
+ - t3416: set $EDITOR in subshell
411
+ - t3416: tighten two tests
412
+ (this branch is used by pw/rebase-reflog-fixes.)
413
+
414
+ "git rebase --keep-base" used to discard the commits that are
415
+ already cherry-picked to the upstream, even when "keep-base" meant
416
+ that the base, on top of which the history is being rebuilt, does
417
+ not yet include these cherry-picked commits. The --keep-base
418
+ option now implies --reapply-cherry-picks and --no-fork-point
419
+ options.
420
+
421
+ Will merge to 'next'??
422
+ source: <pull.1323.v4.git.1666012665.gitgitgadget@gmail.com>
423
+
424
+
425
+* ab/grep-simplify-extended-expression (2022-10-11) 1 commit
426
+ (merged to 'next' on 2022-10-13 at 07993f09bc)
427
+ + grep.c: remove "extended" in favor of "pattern_expression", fix segfault
428
+
429
+ Giving "--invert-grep" and "--all-match" without "--grep" to the
430
+ "git log" command resulted in an attempt to access grep pattern
431
+ expression structure that has not been allocated, which has been
432
+ corrected.
433
+
434
+ Will merge to 'master'.
435
+ source: <patch-v2-1.1-6ad7627706f-20221011T094715Z-avarab@gmail.com>
436
+
437
+
438
+* rs/archive-dedup-printf (2022-10-11) 1 commit
439
+ (merged to 'next' on 2022-10-13 at af770cf00f)
440
+ + archive: deduplicate verbose printing
441
+
442
+ Code simplification.
443
+
444
+ Will merge to 'master'.
445
+ source: <af5611aa-8662-7508-4f00-7fcf4e9cbcc6@web.de>
446
+
447
+
448
+* pw/rebase-reflog-fixes (2022-10-17) 9 commits
449
+ - rebase: cleanup action handling
450
+ - rebase --abort: improve reflog message
451
+ - rebase --apply: make reflog messages match rebase --merge
452
+ - rebase --apply: respect GIT_REFLOG_ACTION
453
+ - rebase --merge: fix reflog message after skipping
454
+ - rebase --merge: fix reflog when continuing
455
+ - t3406: rework rebase reflog tests
456
+ - rebase --apply: remove duplicated code
457
+ - Merge branch 'pw/rebase-keep-base-fixes' into pw/rebase-reflog-fixes
458
+ (this branch uses pw/rebase-keep-base-fixes.)
459
+
460
+ Fix some bugs in the reflog messages when rebasing and changes the
461
+ reflog messages of "rebase --apply" to match "rebase --merge" with
462
+ the aim of making the reflog easier to parse.
463
+
464
+ Will merge to 'next'??
465
+ source: <pull.1150.v3.git.1665567312.gitgitgadget@gmail.com>
466
+
467
+
468
+* sd/doc-smtp-encryption (2022-10-12) 1 commit
469
+ - docs: git-send-email: difference between ssl and tls smtp-encryption
470
+
471
+ Expecting a reroll??
472
+ cf. <19e5b678-6014-d783-347f-9169371aaa09@iee.email>
473
+ source: <20221012150619.12877-1-sndanailov@wired4ever.net>
474
+
475
+
476
* ab/coding-guidelines-c99 (2022-10-11) 5 commits
339
- - CodingGuidelines: recommend against unportable C99 struct syntax
340
- - CodingGuidelines: mention C99 features we can't use
341
- - CodingGuidelines: allow declaring variables in for loops
342
- - CodingGuidelines: mention dynamic C99 initializer elements
343
- - CodingGuidelines: update for C99
477
+ (merged to 'next' on 2022-10-13 at c6b2b74dfb)
478
+ + CodingGuidelines: recommend against unportable C99 struct syntax
479
+ + CodingGuidelines: mention C99 features we can't use
480
+ + CodingGuidelines: allow declaring variables in for loops
481
+ + CodingGuidelines: mention dynamic C99 initializer elements
482
+ + CodingGuidelines: update for C99
483
484
Update CodingGuidelines to clarify what features to use and avoid
485
in C99.
486
348
- Will merge to 'next'.
487
+ Will merge to 'master'.
488
source: <20221010203800.2154698-1-gitster@pobox.com>
489
490
491
* jc/symbolic-ref-no-recurse (2022-10-09) 1 commit
353
- - symbolic-ref: teach "--[no-]recurse" option
492
+ (merged to 'next' on 2022-10-13 at 532a3f6a5f)
493
+ + symbolic-ref: teach "--[no-]recurse" option
494
495
After checking out a "branch" that is a symbolic-ref that points at
496
another branch, "git symbolic-ref HEAD" reports the underlying
@@ -358,43 +498,35 @@ Release tarballs are available at:
498
The command learned the "--no-recurse" option to stop after
499
dereferencing a symbolic-ref only once.
500
361
- Will merge to 'next'?
362
- source: <xmqqleprcn08.fsf@gitster.g>
363
-
364
-
365
-* jc/use-of-uc-in-log-messages (2022-10-07) 1 commit
366
- (merged to 'next' on 2022-10-11 at 0b8c91d7e2)
367
- + SubmittingPatches: use usual capitalization in the log message body
368
-
369
- Clarify that "the sentence after <area>: prefix does not begin with
370
- a capital letter" rule applies only to the commit title.
371
-
501
Will merge to 'master'.
373
- source: <xmqqedvjfqx1.fsf@gitster.g>
502
+ source: <xmqqleprcn08.fsf@gitster.g>
503
504
505
* ds/cmd-main-reorder (2022-10-08) 1 commit
377
- - git.c: improve code readability in cmd_main()
506
+ (merged to 'next' on 2022-10-14 at d7f07dbecf)
507
+ + git.c: improve code readability in cmd_main()
508
509
Code clean-up.
510
381
- Will merge to 'next'?
511
+ Will merge to 'master'.
512
source: <pull.1355.v3.git.git.1665246097190.gitgitgadget@gmail.com>
513
514
385
-* ed/fsmonitor-inotify (2022-10-10) 6 commits
386
- . fsmonitor: update doc for Linux
387
- . fsmonitor: test updates
388
- . fsmonitor: enable fsmonitor for Linux
389
- . fsmonitor: implement filesystem change listener for Linux
390
- . fsmonitor: determine if filesystem is local or remote
391
- . fsmonitor: prepare to share code between Mac OS and Linux
392
- (this branch uses ed/fsmonitor-on-networked-macos.)
515
+* ed/fsmonitor-inotify (2022-10-14) 7 commits
516
+ - fsmonitor: update doc for Linux
517
+ - fsmonitor: test updates
518
+ - fsmonitor: enable fsmonitor for Linux
519
+ - fsmonitor: implement filesystem change listener for Linux
520
+ - fsmonitor: determine if filesystem is local or remote
521
+ - fsmonitor: prepare to share code between Mac OS and Linux
522
+ - Merge branch 'ed/fsmonitor-on-networked-macos' into ed/fsmonitor-inotify
523
524
Bundled fsmonitor for Linux using inotify API.
525
526
Needs review.
397
- source: <pull.1352.git.git.1665326258.gitgitgadget@gmail.com>
527
+
528
+ Occasional breakages of t7527.16?
529
+ source: <pull.1352.v2.git.git.1665783944.gitgitgadget@gmail.com>
530
531
532
* en/sparse-checkout-design (2022-10-08) 1 commit
@@ -411,27 +543,18 @@ Release tarballs are available at:
543
544
Enable address and undefined sanitizer tasks at GitHub Actions CI.
545
414
- Will merge to and cook in 'next'??
546
+ With this p4 tests seem to die with the server side going away.
547
source: <xmqqpmezxl9p.fsf@gitster.g>
548
549
418
-* rs/use-fspathncmp (2022-10-08) 1 commit
419
- (merged to 'next' on 2022-10-11 at 11cbd1ce81)
420
- + dir: use fspathncmp() in pl_hashmap_cmp()
421
-
422
- Code clean-up.
423
-
424
- Will merge to 'master'.
425
- source: <cb6ffcdb-d719-7928-96b8-e46482dd141f@web.de>
426
-
427
-
550
* jh/struct-zero-init-with-older-clang (2022-10-10) 1 commit
429
- - config.mak.dev: disable suggest braces error on old clang versions
551
+ (merged to 'next' on 2022-10-13 at 393abc3019)
552
+ + config.mak.dev: disable suggest braces error on old clang versions
553
554
Work around older clang that warns against C99 zero initialization
555
syntax for struct.
556
434
- Will merge to 'next'.
557
+ Will merge to 'master'.
558
source: <pull.1375.v2.git.1665416340806.gitgitgadget@gmail.com>
559
560
@@ -446,82 +569,28 @@ Release tarballs are available at:
569
source: <pull.1354.git.git.1665388136.gitgitgadget@gmail.com>
570
571
449
-* pw/remove-rebase-p-test (2022-10-10) 1 commit
450
- (merged to 'next' on 2022-10-11 at 000bd34796)
451
- + t3435: remove redundant test case
452
-
453
- Remove outdated test.
454
-
455
- Will merge to 'master'.
456
- source: <pull.1379.git.1665395106351.gitgitgadget@gmail.com>
457
-
458
-
459
-* ab/run-hook-api-cleanup (2022-10-05) 15 commits
572
+* ab/run-hook-api-cleanup (2022-10-12) 15 commits
573
+ - run-command.c: remove "max_processes", add "const" to signal() handler
574
+ - run-command.c: pass "opts" further down, and use "opts->processes"
575
+ - run-command.c: use "opts->processes", not "pp->max_processes"
576
+ - run-command.c: don't copy "data" to "struct parallel_processes"
577
- run-command.c: don't copy "ungroup" to "struct parallel_processes"
578
- run-command.c: don't copy *_fn to "struct parallel_processes"
579
+ - run-command.c: make "struct parallel_processes" const if possible
580
- run-command API: move *_tr2() users to "run_processes_parallel()"
581
- run-command API: have run_process_parallel() take an "opts" struct
464
- - run-command API: make run_process_parallel{,_tr2}() thin wrappers
465
- - run-command API: add nascent "struct run_process_parallel_opts"
466
- - run-command.c: add an initializer for "struct parallel_processes"
582
+ - run-command.c: use designated init for pp_init(), add "const"
583
- run-command API: don't fall back on online_cpus()
468
- - run-command API: make "jobs" parameter an "unsigned int"
469
- - run-command API: have "run_processes_parallel{,_tr2}()" return void
584
+ - run-command API: make "n" parameter a "size_t"
585
- run-command tests: use "return", not "exit"
586
+ - run-command API: have "run_processes_parallel{,_tr2}()" return void
587
- run-command test helper: use "else if" pattern
472
- - run-command tests: test stdout of run_command_parallel()
473
- - submodule tests: reset "trace.out" between "grep" invocations
474
- - hook tests: fix redirection logic error in 96e7225b310
588
589
Move a global variable added as a hack during regression fixes to
590
its proper place in the API.
591
479
- Needs review.
480
- source: <cover-00.15-00000000000-20220930T111343Z-avarab@gmail.com>
481
-
482
-
483
-* rs/bisect-start-leakfix (2022-10-07) 1 commit
484
- (merged to 'next' on 2022-10-11 at 07f87534c1)
485
- + bisect--helper: plug strvec leak
486
-
487
- Code clean-up that results in plugging a leak.
488
-
489
- Will merge to 'master'.
490
- source: <1965b54b-122a-c965-f886-1a7dd6afbfb4@web.de>
491
-
492
-
493
-* ab/unused-annotation (2022-10-05) 1 commit
494
- (merged to 'next' on 2022-10-11 at c3099ad3ab)
495
- + git-compat-util.h: GCC deprecated message arg only in GCC 4.5+
496
-
497
- Compilation fix for ancient compilers.
498
-
499
- Will merge to 'master'.
500
- source: <20221005221928.703750-1-asedeno@google.com>
501
-
502
-
503
-* dd/document-runtime-prefix-better (2022-10-05) 1 commit
504
- (merged to 'next' on 2022-10-11 at 9f4a3bb7bd)
505
- + Makefile: clarify runtime relative gitexecdir
506
-
507
- Update comment in the Makefile about the RUNTIME_PREFIX config knob.
508
-
509
- Will merge to 'master'.
510
- source: <20221006013205.15015-1-congdanhqx@gmail.com>
511
-
512
-
513
-* jk/cleanup-callback-parameters (2022-10-06) 4 commits
514
- (merged to 'next' on 2022-10-11 at a3350d66b6)
515
- + attr: drop DEBUG_ATTR code
516
- + commit: avoid writing to global in option callback
517
- + multi-pack-index: avoid writing to global in option callback
518
- + test-submodule: inline resolve_relative_url() function
519
-
520
- Code clean-up.
521
-
522
- Will merge to 'master'.
523
- source: <Yz7Tjy7Rh8cXVxYQ@coredump.intra.peff.net>
524
- source: <Yz7UhYXvNl6+1GbZ@coredump.intra.peff.net>
592
+ Will merge to 'next'.
593
+ source: <cover-v3-00.15-00000000000-20221012T205712Z-avarab@gmail.com>
594
595
596
* pw/test-todo (2022-10-06) 3 commits
@@ -535,95 +604,32 @@ Release tarballs are available at:
604
source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>
605
606
538
-* jc/tmp-objdir (2022-09-30) 1 commit
539
- (merged to 'next' on 2022-10-11 at 17d0843c43)
540
- + tmp-objdir: skip clean up when handling a signal
541
-
542
- The code to clean temporary object directories (used for
543
- quarantine) tried to remove them inside its signal handler, which
544
- was a no-no.
545
-
546
- Will merge to 'master'.
547
- source: <pull.1348.v4.git.git.1664570831583.gitgitgadget@gmail.com>
548
-
549
-
550
-* jc/branch-description-unset (2022-09-30) 1 commit
551
- (merged to 'next' on 2022-10-11 at 3f81ee978b)
552
- + branch: do not fail a no-op --edit-desc
553
-
554
- "GIT_EDITOR=: git branch --edit-description" resulted in failure,
555
- which has been corrected.
556
-
557
- Will merge to 'master'.
558
- source: <xmqqmtagka8x.fsf@gitster.g>
559
-
560
-
561
-* rj/branch-edit-desc-unborn (2022-10-07) 1 commit
562
- (merged to 'next' on 2022-10-11 at de3eccde7c)
563
- + branch: description for non-existent branch errors
564
-
565
- "git branch --edit-description" on an unborh branch misleadingly
566
- said that no such branch exists, which has been corrected.
567
-
568
- Will merge to 'master'.
569
- source: <8d627a2c-923f-181f-a03b-15f370c4dd0f@gmail.com>
570
-
571
-
572
-* jt/promisor-remote-fetch-tweak (2022-10-05) 2 commits
573
- (merged to 'next' on 2022-10-11 at e93567bc8f)
574
- + promisor-remote: die upon failing fetch
575
- + promisor-remote: remove a return value
576
-
577
- Remove error detection from a function that fetches from promisor
578
- remotes, and make it die when such a fetch fails to bring all the
579
- requested objects, to give an early failure to various operations.
580
-
581
- Will merge to 'master'.
582
- source: <cover.1664917853.git.jonathantanmy@google.com>
583
-
584
-
585
-* ed/fsmonitor-on-networked-macos (2022-10-10) 7 commits
586
- (merged to 'next' on 2022-10-11 at 32076d13b7)
587
- + fsmonitor: fix leak of warning message
588
- + fsmonitor: add documentation for allowRemote and socketDir options
589
- + fsmonitor: check for compatability before communicating with fsmonitor
590
- + fsmonitor: deal with synthetic firmlinks on macOS
591
- + fsmonitor: avoid socket location check if using hook
592
- + fsmonitor: relocate socket file if .git directory is remote
593
- + fsmonitor: refactor filesystem checks to common interface
594
- (this branch is used by ed/fsmonitor-inotify.)
595
-
596
- By default, use of fsmonitor on a repository on networked
597
- filesystem is disabled. Add knobs to make it workable on macOS.
598
-
599
- Will merge to 'master'.
600
- source: <pull.1326.v15.git.1664904751.gitgitgadget@gmail.com>
601
-
602
-
607
* rj/branch-edit-description-with-nth-checkout (2022-10-10) 1 commit
604
- - branch: support for shortcuts like @{-1}, completed
608
+ (merged to 'next' on 2022-10-14 at 90850a2211)
609
+ + branch: support for shortcuts like @{-1}, completed
610
611
"git branch --edit-description @{-1}" is now a way to edit branch
612
description of the branch you were on before switching to the
613
current branch.
614
610
- Will merge to 'next'.
615
+ Will merge to 'master'.
616
source: <fbf84e26-4306-c8df-0e2c-45dc94129e3a@gmail.com>
617
618
619
* rs/diff-caret-bang-with-parents (2022-10-01) 3 commits
615
- - diff: support ^! for merges
616
- - revisions.txt: unspecify order of resolved parts of ^!
617
- - revision: use strtol_i() for exclude_parent
620
+ (merged to 'next' on 2022-10-17 at 24609eb777)
621
+ + diff: support ^! for merges
622
+ + revisions.txt: unspecify order of resolved parts of ^!
623
+ + revision: use strtol_i() for exclude_parent
624
625
"git diff rev^!" did not show combined diff to go to the rev from
626
its parents.
627
622
- Needs review.
628
+ Will merge to 'master'.
629
source: <16c49d20-cafc-4b48-3c6b-e11c74c29abb@web.de>
630
631
626
-* ab/doc-synopsis-and-cmd-usage (2022-10-05) 34 commits
632
+* ab/doc-synopsis-and-cmd-usage (2022-10-13) 34 commits
633
- tests: assert consistent whitespace in -h output
634
- tests: start asserting that *.txt SYNOPSIS matches -h output
635
- doc txt & -h consistency: make "worktree" consistent
@@ -663,12 +669,13 @@ Release tarballs are available at:
669
shown at the beginning of "git help cmd" have been made more
670
consistent.
671
666
- Needs review.
667
- source: <cover-v4-00.34-00000000000-20221004T132211Z-avarab@gmail.com>
672
+ Will merge to 'next'?
673
+ source: <cover-v5-00.34-00000000000-20221013T153625Z-avarab@gmail.com>
674
675
670
-* ab/coccicheck-incremental (2022-08-31) 9 commits
676
+* ab/coccicheck-incremental (2022-10-14) 11 commits
677
- spatchcache: add a ccache-alike for "spatch"
678
+ - cocci: run against a generated ALL.cocci
679
- cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES
680
- cocci: make "coccicheck" rule incremental
681
- cocci: split off "--all-includes" from SPATCH_FLAGS
@@ -677,12 +684,11 @@ Release tarballs are available at:
684
- Makefile: have "coccicheck" re-run if flags change
685
- Makefile: add ability to TAB-complete cocci *.patch rules
686
- cocci rules: remove unused "F" metavariable from pending rule
687
+ - Makefile + shared.mak: rename and indent $(QUIET_SPATCH_T)
688
689
"make coccicheck" is time consuming. It has been made to run more
690
incrementally.
683
-
684
- Needs review.
685
- source: <cover-v2-0.9-00000000000-20220831T205130Z-avarab@gmail.com>
691
+ source: <cover-v3-00.11-00000000000-20221014T152552Z-avarab@gmail.com>
692
693
694
* ds/bundle-uri-3 (2022-10-12) 13 commits
@@ -703,7 +709,6 @@ Release tarballs are available at:
709
Define the logical elements of a "bundle list", data structure to
710
store them in-core, format to transfer them, and code to parse
711
them.
706
-
712
source: <pull.1333.v5.git.1665579160.gitgitgadget@gmail.com>
713
714