What's cooking (2023/09 #01)
Junio C Hamano committed
Sep 1, 2023 at 14:17 UTC
c88cb83533edcc56d003ecae18050b0f37359e67
1 file changed
+369
-250
whats-cooking.txt
+369
-250
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2023, #08; Mon, 28)
3
-X-master-at: 5dc72c0fbcbccf7dbb42e470e55dafbd2afdf343
4
-X-next-at: 7437a81fcf65029fe0d26191d952ee59c0ab922b
2
+Subject: What's cooking in git.git (Sep 2023, #01; Fri, 1)
3
+X-master-at: d814540bb75bbd2257f9a6bf59661a84fe8cf3cf
4
+X-next-at: 54e51ff1ac8d5254ec31bb709a94c598aa7cdeda
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Aug 2023, #08; Mon, 28)
7
+What's cooking in git.git (Sep 2023, #01; Fri, 1)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,10 +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
-The cycle for 2.43 has started. Hopefully we can drain the topics
21
-that have been cooking in 'next' during the pre-release freeze
22
-period down to 'master' by the end of this week.
23
-
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.
@@ -50,45 +46,340 @@ Release tarballs are available at:
46
https://www.kernel.org/pub/software/scm/git/
47
48
--------------------------------------------------
53
-[New Topics]
49
+[Graduated to 'master']
50
55
-* rs/parse-options-help-text-is-optional (2023-08-28) 1 commit
56
- - parse-options: allow omitting option help text
51
+* ch/t6300-verify-commit-test-cleanup (2023-08-23) 2 commits
52
+ (merged to 'next' on 2023-08-24 at 15b842867e)
53
+ + t/t6300: drop magic filtering
54
+ + t/lib-gpg: forcibly run a trustdb update
55
58
- It may be tempting to leave the help text NULL for a command line
59
- option that is either hidden or too obvious, but "git subcmd -h"
60
- and "git subcmd --help-all" would have segfaulted if done so. Now
61
- the help text is optional.
56
+ Test clean-up.
57
+ source: <20230822150149.541ccb35@leda.eworm.net>
58
63
- Will merge to 'next'.
64
- source: <2b08dc43-621d-2170-c4a6-c2aac33a9a19@web.de>
59
+
60
+* ds/scalar-updates (2023-08-28) 3 commits
61
+ (merged to 'next' on 2023-08-28 at 093e6bcb9c)
62
+ + scalar reconfigure: help users remove buggy repos
63
+ + setup: add discover_git_directory_reason()
64
+ + scalar: add --[no-]src option
65
+
66
+ Scalar updates.
67
+ source: <pull.1569.v3.git.1693230746.gitgitgadget@gmail.com>
68
+
69
+
70
+* jc/ci-skip-same-commit (2023-08-25) 1 commit
71
+ (merged to 'next' on 2023-08-28 at e978717961)
72
+ + ci: avoid building from the same commit in parallel
73
+
74
+ Tweak GitHub Actions CI so that pushing the same commit to multiple
75
+ branch tips at the same time will not waste building and testing
76
+ the same thing twice.
77
+ source: <1da763f3-60bf-a572-2c71-336b1fa5553d@gmx.de>
78
+
79
+
80
+* jc/diff-exit-code-with-w-fixes (2023-08-21) 5 commits
81
+ (merged to 'next' on 2023-08-23 at 436a0aec3d)
82
+ + diff: the -w option breaks --exit-code for --raw and other output modes
83
+ + t4040: remove test that succeeded for a wrong reason
84
+ + diff: teach "--stat -w --exit-code" to notice differences
85
+ + diff: mode-only change should be noticed by "--patch -w --exit-code"
86
+ + diff: move the fallback "--exit-code" code down
87
+
88
+ "git diff -w --exit-code" with various options did not work
89
+ correctly, which is being addressed.
90
+ source: <20230818235932.3253552-1-gitster@pobox.com>
91
+
92
+
93
+* jc/mv-d-to-d-error-message-fix (2023-08-11) 1 commit
94
+ (merged to 'next' on 2023-08-21 at 2220d22d6f)
95
+ + mv: fix error for moving directory to another
96
+
97
+ Typofix in an error message.
98
+ source: <xmqqjzu1njt0.fsf@gitster.g>
99
+
100
+
101
+* jk/diff-result-code-cleanup (2023-08-21) 7 commits
102
+ (merged to 'next' on 2023-08-25 at 3b1280d42f)
103
+ + diff: drop useless "status" parameter from diff_result_code()
104
+ + diff: drop useless return values in git-diff helpers
105
+ + diff: drop useless return from run_diff_{files,index} functions
106
+ + diff: die when failing to read index in git-diff builtin
107
+ + diff: show usage for unknown builtin_diff_files() options
108
+ + diff-files: avoid negative exit value
109
+ + diff: spell DIFF_INDEX_CACHED out when calling run_diff_index()
110
+
111
+ "git diff --no-such-option" and other corner cases around the exit
112
+ status of the "diff" command has been corrected.
113
+ source: <20230821201358.GA2663749@coredump.intra.peff.net>
114
+
115
+
116
+* ob/format-patch-description-file (2023-08-21) 1 commit
117
+ (merged to 'next' on 2023-08-25 at 89ea619311)
118
+ + format-patch: add --description-file option
119
+
120
+ "git format-patch" learns a way to feed cover letter description,
121
+ that (1) can be used on detached HEAD where there is no branch
122
+ description available, and (2) also can override the branch
123
+ description if there is one.
124
+ source: <20230821170720.577820-1-oswald.buddenhagen@gmx.de>
125
+
126
+
127
+* ob/sequencer-empty-hint-fix (2023-08-24) 1 commit
128
+ (merged to 'next' on 2023-08-24 at 626c52ad72)
129
+ + sequencer: rectify empty hint in call of require_clean_work_tree()
130
+
131
+ The use of API between two calls to require_clean_work_tree() from
132
+ the sequencer code has been cleaned up for consistency.
133
+ source: <20230824150046.802008-1-oswald.buddenhagen@gmx.de>
134
+
135
+
136
+* py/git-gui-updates (2023-08-24) 16 commits
137
+ (merged to 'next' on 2023-08-28 at df0b742344)
138
+ + Merge https://github.com/prati0100/git-gui
139
+ + Merge branch 'ml/cygwin-fixes'
140
+ + git-gui - use mkshortcut on Cygwin
141
+ + git-gui - use cygstart to browse on Cygwin
142
+ + git-gui - remove obsolete Cygwin specific code
143
+ + git gui Makefile - remove Cygwin modifications
144
+ + Merge branch 'ab/makeflags'
145
+ + Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4
146
+ + Merge branch 'js/windows-rce'
147
+ + Work around Tcl's default `PATH` lookup
148
+ + Move the `_which` function (almost) to the top
149
+ + Move is_<platform> functions to the beginning
150
+ + is_Cygwin: avoid `exec`ing anything
151
+ + windows: ignore empty `PATH` elements
152
+ + Merge branch 'vk/readme-typo'
153
+ + git-gui: Fix a typo in README
154
+
155
+ Git GUI updates.
156
+
157
+
158
+* sl/sparse-check-attr (2023-08-11) 3 commits
159
+ (merged to 'next' on 2023-08-21 at c202b15517)
160
+ + check-attr: integrate with sparse-index
161
+ + attr.c: read attributes in a sparse directory
162
+ + t1092: add tests for 'git check-attr'
163
+
164
+ Teach "git check-attr" work better with sparse-index.
165
+ cf. <3b2a5b4b-ab8f-746b-6b69-8e8262b6390b@github.com>
166
+ source: <20230811142211.4547-1-cheskaqiqi@gmail.com>
167
+
168
+
169
+* tb/commit-graph-verify-fix (2023-08-21) 4 commits
170
+ (merged to 'next' on 2023-08-23 at 2b4b74bb0d)
171
+ + commit-graph: avoid repeated mixed generation number warnings
172
+ + t/t5318-commit-graph.sh: test generation zero transitions during fsck
173
+ + commit-graph: verify swapped zero/non-zero generation cases
174
+ + commit-graph: introduce `commit_graph_generation_from_graph()`
175
+
176
+ The commit-graph verification code that detects mixture of zero and
177
+ non-zero generation numbers has been updated.
178
+ source: <cover.1692653671.git.me@ttaylorr.com>
179
+
180
+
181
+* ts/unpacklimit-config-fix (2023-08-22) 1 commit
182
+ (merged to 'next' on 2023-08-23 at 4fabd9a697)
183
+ + transfer.unpackLimit: fetch/receive.unpackLimit takes precedence
184
+
185
+ transfer.unpackLimit ought to be used as a fallback, but overrode
186
+ fetch.unpackLimit and receive.unpackLimit instead.
187
+ source: <xmqqpm3eh7f6.fsf@gitster.g>
188
189
--------------------------------------------------
67
-[Graduated to 'master']
190
+[New Topics]
191
+
192
+* dd/format-patch-rfc-updates (2023-08-31) 1 commit
193
+ (merged to 'next' on 2023-09-01 at ad87c89ee3)
194
+ + format-patch: --rfc honors what --subject-prefix sets
195
+
196
+ "git format-patch --rfc --subject-prefix=<foo>" used to ignore the
197
+ "--subject-prefix" option and used "[RFC PATCH]"; now we will add
198
+ "RFC" prefix to whatever subject prefix is specified.
199
+
200
+ This is a backward compatible change that may deserve a note.
201
+
202
+ Will merge to 'master'.
203
+ source: <20230830064646.30904-1-sir@cmpwn.com>
204
+
205
+
206
+* jk/test-lsan-denoise-output (2023-08-28) 1 commit
207
+ (merged to 'next' on 2023-08-29 at 9642d76264)
208
+ + test-lib: ignore uninteresting LSan output
209
+
210
+ Tests with LSan from time to time seem to emit harmless message
211
+ that makes our tests unnecessarily flakey; we work it around by
212
+ filtering the uninteresting output.
213
+
214
+ Will merge to 'master'.
215
+ source: <20230828183735.GA3015072@coredump.intra.peff.net>
216
+
217
+
218
+* jk/unused-post-2.42 (2023-08-29) 22 commits
219
+ (merged to 'next' on 2023-08-30 at ab0538e754)
220
+ + update-ref: mark unused parameter in parser callbacks
221
+ + gc: mark unused descriptors in scheduler callbacks
222
+ + bundle-uri: mark unused parameters in callbacks
223
+ + fetch: mark unused parameter in ref_transaction callback
224
+ + credential: mark unused parameter in urlmatch callback
225
+ + grep: mark unused parmaeters in pcre fallbacks
226
+ + imap-send: mark unused parameters with NO_OPENSSL
227
+ + worktree: mark unused parameters in noop repair callback
228
+ + negotiator/noop: mark unused callback parameters
229
+ + add-interactive: mark unused callback parameters
230
+ + grep: mark unused parameter in output function
231
+ + test-trace2: mark unused argv/argc parameters
232
+ + trace2: mark unused config callback parameter
233
+ + trace2: mark unused us_elapsed_absolute parameters
234
+ + stash: mark unused parameter in diff callback
235
+ + ls-tree: mark unused parameter in callback
236
+ + commit-graph: mark unused data parameters in generation callbacks
237
+ + worktree: mark unused parameters in each_ref_fn callback
238
+ + pack-bitmap: mark unused parameters in show_object callback
239
+ + ref-filter: mark unused parameters in parser callbacks
240
+ + sequencer: mark repository argument as unused
241
+ + sequencer: use repository parameter in short_commit_name()
242
+
243
+ Unused parameters to functions are marked as such, and/or removed,
244
+ in order to bring us closer to -Wunused-parameter clean.
245
+
246
+ Will merge to 'master'.
247
+ source: <20230829234305.GA226944@coredump.intra.peff.net>
248
+
249
+
250
+* js/ci-san-skip-p4-and-svn-tests (2023-08-29) 1 commit
251
+ (merged to 'next' on 2023-08-29 at 9617f99668)
252
+ + ci(linux-asan-ubsan): let's save some time
253
+
254
+ Flakey "git p4" tests, as well as "git svn" tests, are now skipped
255
+ in the (rather expensive) sanitizer CI job.
256
+
257
+ Will merge to 'master'.
258
+ source: <pull.1578.v2.git.1693342048633.gitgitgadget@gmail.com>
259
+
260
69
-* mh/credential-erase-improvements-more (2023-07-26) 2 commits
70
- (merged to 'next' on 2023-08-08 at fd1ba4accf)
71
- + credential/wincred: erase matching creds only
72
- + credential/libsecret: erase matching creds only
261
+* tb/multi-cruft-pack (2023-08-29) 4 commits
262
+ (merged to 'next' on 2023-08-30 at 15f0b56ed0)
263
+ + Documentation/gitformat-pack.txt: drop mixed version section
264
+ + Documentation/gitformat-pack.txt: remove multi-cruft packs alternative
265
+ + builtin/pack-objects.c: support `--max-pack-size` with `--cruft`
266
+ + builtin/pack-objects.c: remove unnecessary strbuf_reset()
267
74
- Update two credential helpers to correctly match which credential
75
- to erase; they dropped not the ones with stale password.
76
- source: <pull.1527.v2.git.git.1690387585634.gitgitgadget@gmail.com>
77
- source: <pull.1529.git.git.1687596777147.gitgitgadget@gmail.com>
268
+ Use of --max-pack-size to allow multiple packfiles to be created is
269
+ now supported even when we are sending unreachable objects to cruft
270
+ packs.
271
272
+ Will merge to 'master'.
273
+ source: <cover.1693262936.git.me@ttaylorr.com>
274
+
275
+
276
+* jk/ci-retire-allow-ref (2023-08-30) 2 commits
277
+ (merged to 'next' on 2023-08-31 at 5fe4861f16)
278
+ + ci: deprecate ci/config/allow-ref script
279
+ + ci: allow branch selection through "vars"
280
+
281
+ CI update.
282
+
283
+ Will merge to 'master'.
284
+ source: <20230830194919.GA1709446@coredump.intra.peff.net>
285
+
286
+
287
+* ws/git-svn-retire-faketerm (2023-08-30) 1 commit
288
+ (merged to 'next' on 2023-08-31 at cb6e0d658d)
289
+ + git-svn: drop FakeTerm hack
290
+
291
+ Code clean-up.
292
+
293
+ Will merge to 'master'.
294
+ source: <xmqqa5u888lz.fsf_-_@gitster.g>
295
+
296
+
297
+* jk/unused-post-2.42-part2 (2023-08-31) 10 commits
298
+ - parse-options: mark unused parameters in noop callback
299
+ - interpret-trailers: mark unused "unset" parameters in option callbacks
300
+ - parse-options: add more BUG_ON() annotations
301
+ - merge: do not pass unused opt->value parameter
302
+ - parse-options: mark unused "opt" parameter in callbacks
303
+ - parse-options: prefer opt->value to globals in callbacks
304
+ - checkout-index: delay automatic setting of to_tempfile
305
+ - format-patch: use OPT_STRING_LIST for to/cc options
306
+ - merge: simplify parsing of "-n" option
307
+ - merge: make xopts a strvec
308
80
-* mh/credential-libsecret-attrs (2023-06-16) 1 commit
81
- (merged to 'next' on 2023-08-08 at dc73a2c55a)
82
- + credential/libsecret: store new attributes
309
+ Unused parameters to functions are marked as such, and/or removed,
310
+ in order to bring us closer to -Wunused-parameter clean.
311
84
- The way authentication related data other than passwords (e.g.
85
- oath token and password expiration data) are stored in libsecret
86
- keyrings has been rethought.
87
- source: <pull.1469.v5.git.git.1686945306242.gitgitgadget@gmail.com>
312
+ Will merge to 'next'?
313
+ source: <20230831211637.GA949188@coredump.intra.peff.net>
314
+
315
+
316
+* jk/tree-name-and-depth-limit (2023-08-31) 10 commits
317
+ - lower core.maxTreeDepth default to 2048
318
+ - tree-diff: respect max_allowed_tree_depth
319
+ - list-objects: respect max_allowed_tree_depth
320
+ - read_tree(): respect max_allowed_tree_depth
321
+ - traverse_trees(): respect max_allowed_tree_depth
322
+ - add core.maxTreeDepth config
323
+ - fsck: detect very large tree pathnames
324
+ - tree-walk: rename "error" variable
325
+ - tree-walk: drop MAX_TRAVERSE_TREES macro
326
+ - tree-walk: reduce stack size for recursive functions
327
+
328
+ We now limit depth of the tree objects and maximum length of
329
+ pathnames recorded in tree objects.
330
+ source: <20230831061735.GA2702156@coredump.intra.peff.net>
331
+
332
+
333
+* js/doc-unit-tests-with-cmake (2023-08-31) 4 commits
334
+ - artifacts-tar: when including `.dll` files, don't forget the unit-tests
335
+ - unit-tests: do show relative file paths
336
+ - unit-tests: do not mistake `.pdb` files for being executable
337
+ - cmake: also build unit tests
338
+ (this branch uses js/doc-unit-tests.)
339
+
340
+ Update the base topic to work with CMake builds.
341
+ source: <pull.1579.git.1693462532.gitgitgadget@gmail.com>
342
+
343
+
344
+* ew/hash-with-openssl-evp (2023-08-31) 1 commit
345
+ - treewide: fix various bugs w/ OpenSSL 3+ EVP API
346
+
347
+ Fix-up new-ish code to support OpenSSL EVP API.
348
+
349
+ Will merge to 'next'?
350
+ source: <20230901020928.M610756@dcvr>
351
352
--------------------------------------------------
353
[Stalled]
354
355
+* js/doc-unit-tests (2023-08-17) 3 commits
356
+ - ci: run unit tests in CI
357
+ - unit tests: add TAP unit test framework
358
+ - unit tests: Add a project plan document
359
+ (this branch is used by js/doc-unit-tests-with-cmake.)
360
+
361
+ Process to add some form of low-level unit tests has started.
362
+
363
+ Comments?
364
+ source: <cover.1692297001.git.steadmon@google.com>
365
+
366
+
367
+* ak/pretty-decorate-more (2023-08-21) 8 commits
368
+ - decorate: use commit color for HEAD arrow
369
+ - pretty: add pointer and tag options to %(decorate)
370
+ - pretty: add %(decorate[:<options>]) format
371
+ - decorate: color each token separately
372
+ - decorate: avoid some unnecessary color overhead
373
+ - decorate: refactor format_decorations()
374
+ - pretty-formats: enclose options in angle brackets
375
+ - pretty-formats: define "literal formatting code"
376
+
377
+ "git log --format" has been taught the %(decorate) placeholder.
378
+
379
+ What's the status of this thing?
380
+ source: <20230820185009.20095-1-andy.koppe@gmail.com>
381
+
382
+
383
* cc/repack-sift-filtered-objects-to-separate-pack (2023-08-13) 8 commits
384
. gc: add `gc.repackFilterTo` config option
385
. repack: implement `--filter-to` for storing filtered out objects
@@ -107,18 +398,6 @@ Release tarballs are available at:
398
source: <20230812000011.1227371-1-christian.couder@gmail.com>
399
400
110
-* ob/send-email-interactive-failure (2023-08-21) 1 commit
111
- - send-email: prompt-dependent exit codes
112
-
113
- "git send-email" exits with non-zero status when end-user
114
- interaction causes any prepared message not to be sent.
115
-
116
- Expecting a reroll.
117
- Without an opt-in fix, this will be a backward-incompatible
118
- change that needs mention in the release notes.
119
- source: <20230821170720.577835-1-oswald.buddenhagen@gmx.de>
120
-
121
-
401
* cc/git-replay (2023-06-03) 15 commits
402
- replay: stop assuming replayed branches do not diverge
403
- replay: add --contained to rebase contained branches
@@ -154,24 +433,20 @@ Release tarballs are available at:
433
--------------------------------------------------
434
[Cooking]
435
157
-* jk/diff-result-code-cleanup (2023-08-21) 7 commits
158
- (merged to 'next' on 2023-08-25 at 3b1280d42f)
159
- + diff: drop useless "status" parameter from diff_result_code()
160
- + diff: drop useless return values in git-diff helpers
161
- + diff: drop useless return from run_diff_{files,index} functions
162
- + diff: die when failing to read index in git-diff builtin
163
- + diff: show usage for unknown builtin_diff_files() options
164
- + diff-files: avoid negative exit value
165
- + diff: spell DIFF_INDEX_CACHED out when calling run_diff_index()
436
+* rs/parse-options-help-text-is-optional (2023-08-28) 1 commit
437
+ (merged to 'next' on 2023-08-29 at 5466f7fcb2)
438
+ + parse-options: allow omitting option help text
439
167
- "git diff --no-such-option" and other corner cases around the exit
168
- status of the "diff" command has been corrected.
440
+ It may be tempting to leave the help text NULL for a command line
441
+ option that is either hidden or too obvious, but "git subcmd -h"
442
+ and "git subcmd --help-all" would have segfaulted if done so. Now
443
+ the help text is optional.
444
445
Will merge to 'master'.
171
- source: <20230821201358.GA2663749@coredump.intra.peff.net>
446
+ source: <2b08dc43-621d-2170-c4a6-c2aac33a9a19@web.de>
447
448
174
-* tb/path-filter-fix (2023-08-21) 15 commits
449
+* tb/path-filter-fix (2023-08-30) 15 commits
450
- bloom: introduce `deinit_bloom_filters()`
451
- commit-graph: reuse existing Bloom filters where possible
452
- object.h: fix mis-aligned flag bits table
@@ -192,30 +467,9 @@ Release tarballs are available at:
467
on systems whose "char" is unsigned; update the implementation and
468
bump the format version to 2.
469
195
- Comments?
196
- source: <cover.1692654233.git.me@ttaylorr.com>
197
-
198
-
199
-* ch/t6300-verify-commit-test-cleanup (2023-08-23) 2 commits
200
- (merged to 'next' on 2023-08-24 at 15b842867e)
201
- + t/t6300: drop magic filtering
202
- + t/lib-gpg: forcibly run a trustdb update
203
-
204
- Test clean-up.
205
-
206
- Will merge to 'master'.
207
- source: <20230822150149.541ccb35@leda.eworm.net>
208
-
209
-
210
-* ts/unpacklimit-config-fix (2023-08-22) 1 commit
211
- (merged to 'next' on 2023-08-23 at 4fabd9a697)
212
- + transfer.unpackLimit: fetch/receive.unpackLimit takes precedence
213
-
214
- transfer.unpackLimit ought to be used as a fallback, but overrode
215
- fetch.unpackLimit and receive.unpackLimit instead.
216
-
217
- Will merge to 'master'.
218
- source: <xmqqpm3eh7f6.fsf@gitster.g>
470
+ Needs more work?
471
+ cf. <20230830200218.GA5147@szeder.dev>
472
+ source: <cover.1693413637.git.jonathantanmy@google.com>
473
474
475
* js/config-parse (2023-08-23) 4 commits
@@ -224,81 +478,23 @@ Release tarballs are available at:
478
- config: report config parse errors using cb
479
- config: split out config_parse_options
480
227
- Split out parsing routines for the configuration files into a
228
- separate file.
481
+ The parsing routines for the configuration files have been split
482
+ into a separate file.
483
484
Needs review.
485
source: <cover.1692827403.git.steadmon@google.com>
486
487
234
-* jc/ci-skip-same-commit (2023-08-25) 1 commit
235
- (merged to 'next' on 2023-08-28 at e978717961)
236
- + ci: avoid building from the same commit in parallel
237
-
238
- Tweak GitHub Actions CI so that pushing the same commit to multiple
239
- branch tips at the same time will not waste building and testing
240
- the same thing twice.
241
-
242
- Will merge to 'master'.
243
- source: <1da763f3-60bf-a572-2c71-336b1fa5553d@gmx.de>
244
-
488
+* tb/mark-more-tests-as-leak-free (2023-08-29) 3 commits
489
+ (merged to 'next' on 2023-08-29 at c1db288281)
490
+ + leak tests: mark t5583-push-branches.sh as leak-free
491
+ + leak tests: mark t3321-notes-stripspace.sh as leak-free
492
+ + leak tests: mark a handful of tests as leak-free
493
246
-* py/git-gui-updates (2023-08-24) 16 commits
247
- (merged to 'next' on 2023-08-28 at df0b742344)
248
- + Merge https://github.com/prati0100/git-gui
249
- + Merge branch 'ml/cygwin-fixes'
250
- + git-gui - use mkshortcut on Cygwin
251
- + git-gui - use cygstart to browse on Cygwin
252
- + git-gui - remove obsolete Cygwin specific code
253
- + git gui Makefile - remove Cygwin modifications
254
- + Merge branch 'ab/makeflags'
255
- + Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4
256
- + Merge branch 'js/windows-rce'
257
- + Work around Tcl's default `PATH` lookup
258
- + Move the `_which` function (almost) to the top
259
- + Move is_<platform> functions to the beginning
260
- + is_Cygwin: avoid `exec`ing anything
261
- + windows: ignore empty `PATH` elements
262
- + Merge branch 'vk/readme-typo'
263
- + git-gui: Fix a typo in README
264
-
265
- Git GUI updates.
494
+ Tests that are known to pass with LSan are now marked as such.
495
496
Will merge to 'master'.
268
-
269
-
270
-* tb/mark-more-tests-as-leak-free (2023-08-24) 3 commits
271
- - leak tests: mark t5583-push-branches.sh as leak-free
272
- - leak tests: mark t3321-notes-stripspace.sh as leak-free
273
- - leak tests: mark a handful of tests as leak-free
274
-
275
- source: <cover.1692902414.git.me@ttaylorr.com>
276
-
277
-
278
-* ob/sequencer-empty-hint-fix (2023-08-24) 1 commit
279
- (merged to 'next' on 2023-08-24 at 626c52ad72)
280
- + sequencer: rectify empty hint in call of require_clean_work_tree()
281
-
282
- Update the use of API for consistency between two calls to
283
- require_clean_work_tree() from the sequencer code.
284
-
285
- Will merge to 'master'.
286
- source: <20230824150046.802008-1-oswald.buddenhagen@gmx.de>
287
-
288
-
289
-* jc/diff-exit-code-with-w-fixes (2023-08-21) 5 commits
290
- (merged to 'next' on 2023-08-23 at 436a0aec3d)
291
- + diff: the -w option breaks --exit-code for --raw and other output modes
292
- + t4040: remove test that succeeded for a wrong reason
293
- + diff: teach "--stat -w --exit-code" to notice differences
294
- + diff: mode-only change should be noticed by "--patch -w --exit-code"
295
- + diff: move the fallback "--exit-code" code down
296
-
297
- "git diff -w --exit-code" with various options did not work
298
- correctly, which is being addressed.
299
-
300
- Will merge to 'master'.
301
- source: <20230818235932.3253552-1-gitster@pobox.com>
497
+ source: <cover.1693263171.git.me@ttaylorr.com>
498
499
500
* jc/update-index-show-index-version (2023-08-18) 3 commits
@@ -317,101 +513,14 @@ Release tarballs are available at:
513
- git-revert.txt: add discussion
514
- sequencer: beautify subject of reverts of reverts
515
320
- Tweak the default log message created by "git revert" when
321
- reverting a commit that records a revert.
516
+ The default log message created by "git revert", when reverting a
517
+ commit that records a revert, has been tweaked.
518
519
Expecting a (hopefully small and final) reroll.
520
cf. <ZOZnNDd2pMX6M2Au@nand.local>
521
source: <20230809171531.2564807-1-oswald.buddenhagen@gmx.de>
522
523
328
-* ob/format-patch-description-file (2023-08-21) 1 commit
329
- (merged to 'next' on 2023-08-25 at 89ea619311)
330
- + format-patch: add --description-file option
331
-
332
- "git format-patch" learns a way to feed cover letter description,
333
- that (1) can be used on detached HEAD where there is no branch
334
- description available, and (2) also can override the branch
335
- description if there is one.
336
-
337
- Will merge to 'master'.
338
- source: <20230821170720.577820-1-oswald.buddenhagen@gmx.de>
339
-
340
-
341
-* ds/scalar-updates (2023-08-28) 3 commits
342
- (merged to 'next' on 2023-08-28 at 093e6bcb9c)
343
- + scalar reconfigure: help users remove buggy repos
344
- + setup: add discover_git_directory_reason()
345
- + scalar: add --[no-]src option
346
-
347
- Scalar updates.
348
- Will merge to 'master'.
349
- source: <pull.1569.v3.git.1693230746.gitgitgadget@gmail.com>
350
-
351
-
352
-* jc/mv-d-to-d-error-message-fix (2023-08-11) 1 commit
353
- (merged to 'next' on 2023-08-21 at 2220d22d6f)
354
- + mv: fix error for moving directory to another
355
-
356
- Typofix in an error message.
357
-
358
- Will merge to 'master'.
359
- source: <xmqqjzu1njt0.fsf@gitster.g>
360
-
361
-
362
-* sl/sparse-check-attr (2023-08-11) 3 commits
363
- (merged to 'next' on 2023-08-21 at c202b15517)
364
- + check-attr: integrate with sparse-index
365
- + attr.c: read attributes in a sparse directory
366
- + t1092: add tests for 'git check-attr'
367
-
368
- Teach "git check-attr" work better with sparse-index.
369
-
370
- Will merge to 'master'.
371
- cf. <3b2a5b4b-ab8f-746b-6b69-8e8262b6390b@github.com>
372
- source: <20230811142211.4547-1-cheskaqiqi@gmail.com>
373
-
374
-
375
-* ws/svn-with-new-readline (2023-08-11) 1 commit
376
- - git-svn: avoid creating more than one than one Term::ReadLine object
377
-
378
- Adjust to newer Term::ReadLine to prevent it from breaking
379
- the interactive prompt code in git-svn.
380
-
381
- Not needed for correctness.
382
- source: <20230810011831.1423208-1-wesleys@opperschaap.net>
383
-
384
-
385
-* ak/pretty-decorate-more (2023-08-21) 8 commits
386
- - decorate: use commit color for HEAD arrow
387
- - pretty: add pointer and tag options to %(decorate)
388
- - pretty: add %(decorate[:<options>]) format
389
- - decorate: color each token separately
390
- - decorate: avoid some unnecessary color overhead
391
- - decorate: refactor format_decorations()
392
- - pretty-formats: enclose options in angle brackets
393
- - pretty-formats: define "literal formatting code"
394
-
395
- Teach "git log --format" a customizable %(decorate) placeholder.
396
-
397
- What's the status of this thing?
398
- source: <20230820185009.20095-1-andy.koppe@gmail.com>
399
-
400
-
401
-* tb/commit-graph-verify-fix (2023-08-21) 4 commits
402
- (merged to 'next' on 2023-08-23 at 2b4b74bb0d)
403
- + commit-graph: avoid repeated mixed generation number warnings
404
- + t/t5318-commit-graph.sh: test generation zero transitions during fsck
405
- + commit-graph: verify swapped zero/non-zero generation cases
406
- + commit-graph: introduce `commit_graph_generation_from_graph()`
407
-
408
- Update commit-graph verification code that detects mixture of zero
409
- and non-zero generation numbers.
410
-
411
- Will merge to 'master'.
412
- source: <cover.1692653671.git.me@ttaylorr.com>
413
-
414
-
524
* la/trailer-cleanups (2023-08-06) 5 commits
525
- trailer: rename *_DEFAULT enums to *_UNSPECIFIED
526
- trailer: teach find_patch_start about --no-divider
@@ -442,7 +551,7 @@ Release tarballs are available at:
551
- trailer test description: this tests --where=after, not --where=before
552
- trailer tests: make test cases self-contained
553
445
- Test coverage improvement for trailers.
554
+ Test coverage for trailers has been improved.
555
556
Expecting a reroll.
557
cf. <owlyh6p5fpi7.fsf@fine.c.googlers.com>
@@ -509,17 +618,6 @@ Release tarballs are available at:
618
cf. <xmqqtttia3vn.fsf@gitster.g>
619
source: <48745298-f12b-8efb-4e48-90d2c22a8349@gmail.com>
620
512
-
513
-* js/doc-unit-tests (2023-08-17) 3 commits
514
- - ci: run unit tests in CI
515
- - unit tests: add TAP unit test framework
516
- - unit tests: Add a project plan document
517
-
518
- Process to add some form of low-level unit tests has started.
519
-
520
- Comments?
521
- source: <cover.1692297001.git.steadmon@google.com>
522
-
621
--------------------------------------------------
622
[Discarded]
623
@@ -556,3 +654,24 @@ Release tarballs are available at:
654
655
Stalled for too long.
656
source: <cover-v2-0.3-00000000000-20221230T011725Z-avarab@gmail.com>
657
+
658
+
659
+* ob/send-email-interactive-failure (2023-08-29) 2 commits
660
+ . SQUASH???
661
+ . send-email: prompt-dependent exit codes
662
+
663
+ "git send-email" exits with non-zero status when end-user
664
+ interaction causes any prepared message not to be sent.
665
+
666
+ Breaks existing users without even an opt-out knob.
667
+ source: <20230821170720.577835-1-oswald.buddenhagen@gmx.de>
668
+
669
+
670
+* ws/svn-with-new-readline (2023-08-11) 1 commit
671
+ . git-svn: avoid creating more than one than one Term::ReadLine object
672
+
673
+ Adjust to newer Term::ReadLine to prevent it from breaking
674
+ the interactive prompt code in git-svn.
675
+
676
+ Superseded by ws/git-svn-retire-faketerm
677
+ source: <20230810011831.1423208-1-wesleys@opperschaap.net>