What's cooking (2024/07 #05)
Junio C Hamano committed
Jul 16, 2024 at 16:04 UTC
c9f280fb78f448e2292ef6760888302d265f66d8
1 file changed
+353
-318
whats-cooking.txt
+353
-318
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2024, #04; Fri, 12)
3
-X-master-at: a7dae3bdc8b516d36f630b12bb01e853a667e0d9
4
-X-next-at: eb743b3ca22675107e6ba730058d59d2cf3cb6fa
2
+Subject: What's cooking in git.git (Jul 2024, #05; Tue, 16)
3
+X-master-at: 04f5a52757cd92347271e24f7cbdfe15dafce3b7
4
+X-next-at: 44c27ab58a06e5c08647e891ceb89879d1423b71
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jul 2024, #04; Fri, 12)
7
+What's cooking in git.git (Jul 2024, #05; Tue, 16)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,8 +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
-Git 2.46-rc0 has been tagged.
21
-
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,104 +48,248 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
53
-* as/pathspec-h-typofix (2024-07-01) 1 commit
54
- (merged to 'next' on 2024-07-02 at ae7cee4189)
55
- + pathspec: fix typo "glossary-context.txt" -> "glossary-content.txt"
51
+* am/gitweb-feed-use-committer-date (2024-07-07) 1 commit
52
+ (merged to 'next' on 2024-07-08 at 65215ab842)
53
+ + gitweb: rss/atom change published/updated date to committer date
54
57
- Typofix.
58
- source: <20240629193137.54037-1-abhijeet.nkt@gmail.com>
55
+ GitWeb update to use committer date consistently in rss/atom feeds.
56
+ source: <20240707184813.33166-1-080ariel@gmail.com>
57
58
61
-* rs/simplify-submodule-helper-super-prefix-invocation (2024-07-01) 1 commit
62
- (merged to 'next' on 2024-07-02 at 06e1677920)
63
- + submodule--helper: use strvec_pushf() for --super-prefix
59
+* as/describe-broken-refresh-index-fix (2024-06-26) 1 commit
60
+ (merged to 'next' on 2024-07-08 at 2307a4a4ae)
61
+ + describe: refresh the index when 'broken' flag is used
62
65
- Code clean-up.
66
- source: <fb79ebc4-5ecf-4257-ac2e-39f98db5649c@web.de>
63
+ "git describe --dirty --broken" forgot to refresh the index before
64
+ seeing if there is any chang, ("git describe --dirty" correctly did
65
+ so), which has been corrected.
66
+ source: <20240626190801.68472-1-abhijeet.nkt@gmail.com>
67
68
---------------------------------------------------
69
-[New Topics]
68
71
-* es/doc-platform-support-policy (2024-07-12) 1 commit
72
- - Documentation: add platform support policy
69
+* bc/gitfaq-more (2024-07-09) 4 commits
70
+ (merged to 'next' on 2024-07-10 at eeec4009e4)
71
+ + doc: mention that proxies must be completely transparent
72
+ + gitfaq: add entry about syncing working trees
73
+ + gitfaq: give advice on using eol attribute in gitattributes
74
+ + gitfaq: add documentation on proxies
75
74
- A policy document that describes platform support levels and
75
- expectation on platform stakeholders has been introduced.
76
+ A handful of entries are added to the GitFAQ document.
77
+ source: <20240709233746.445860-1-sandals@crustytoothpaste.net>
78
77
- What's the doneness of this one?
78
- source: <20240711232413.693444-1-emilyshaffer@google.com>
79
80
+* bc/http-proactive-auth (2024-07-09) 1 commit
81
+ (merged to 'next' on 2024-07-10 at 29b050bf0e)
82
+ + http: allow authenticating proactively
83
81
-* js/var-git-shell-path (2024-07-12) 7 commits
82
- - var(win32): do report the GIT_SHELL_PATH that is actually used
83
- - run-command: declare the `git_shell_path()` function globally
84
- - run-command(win32): resolve the path to the Unix shell early
85
- - mingw(is_msys2_sh): handle forward slashes in the `sh.exe` path, too
86
- - win32: override `fspathcmp()` with a directory separator-aware version
87
- - strvec: declare the `strvec_push_nodup()` function globally
88
- - run-command: refactor getting the Unix shell path into its own function
84
+ The http transport can now be told to send request with
85
+ authentication material without first getting a 401 response.
86
+ source: <20240710000155.947377-2-sandals@crustytoothpaste.net>
87
90
- "git var GIT_SHELL_PATH" should report the path to the shell used
91
- to spawn external commands, but it didn't do so on Windows, which
88
+
89
+* cb/send-email-sanitize-trailer-addresses (2024-07-01) 1 commit
90
+ (merged to 'next' on 2024-07-09 at 442a99106a)
91
+ + git-send-email: use sanitized address when reading mbox body
92
+
93
+ Address-looking strings found on the trailer are now placed on the
94
+ Cc: list after running through sanitize_address by "git send-email".
95
+ source: <20240701090115.56957-1-csokas.bence@prolan.hu>
96
+
97
+
98
+* cp/unit-test-reftable-record (2024-07-02) 11 commits
99
+ (merged to 'next' on 2024-07-08 at b534dac338)
100
+ + t-reftable-record: add tests for reftable_log_record_compare_key()
101
+ + t-reftable-record: add tests for reftable_ref_record_compare_name()
102
+ + t-reftable-record: add index tests for reftable_record_is_deletion()
103
+ + t-reftable-record: add obj tests for reftable_record_is_deletion()
104
+ + t-reftable-record: add log tests for reftable_record_is_deletion()
105
+ + t-reftable-record: add ref tests for reftable_record_is_deletion()
106
+ + t-reftable-record: add comparison tests for obj records
107
+ + t-reftable-record: add comparison tests for index records
108
+ + t-reftable-record: add comparison tests for ref records
109
+ + t-reftable-record: add reftable_record_cmp() tests for log records
110
+ + t: move reftable/record_test.c to the unit testing framework
111
+
112
+ A test in reftable library has been rewritten using the unit test
113
+ framework.
114
+ cf. <CAOLa=ZT_x1Kf7EopU+RbBFzX3EPU5NWx6f8L9Uw=sM0MbCXDAQ@mail.gmail.com>
115
+ source: <20240702074906.5587-1-chandrapratap3519@gmail.com>
116
+
117
+
118
+* ds/advice-sparse-index-expansion (2024-07-08) 1 commit
119
+ (merged to 'next' on 2024-07-09 at c821020b13)
120
+ + advice: warn when sparse index expands
121
+
122
+ A new warning message is issued when a command has to expand a
123
+ sparse index to handle working tree cruft that are outside of the
124
+ sparse checkout.
125
+ source: <pull.1756.v2.git.1720448038745.gitgitgadget@gmail.com>
126
+
127
+
128
+* en/ort-inner-merge-error-fix (2024-07-06) 8 commits
129
+ (merged to 'next' on 2024-07-09 at 74bdae0b3b)
130
+ + merge-ort: fix missing early return
131
+ (merged to 'next' on 2024-06-28 at a85fe270e6)
132
+ + merge-ort: convert more error() cases to path_msg()
133
+ + merge-ort: upon merge abort, only show messages causing the abort
134
+ + merge-ort: loosen commented requirements
135
+ + merge-ort: clearer propagation of failure-to-function from merge_submodule
136
+ + merge-ort: fix type of local 'clean' var in handle_content_merge ()
137
+ + merge-ort: maintain expected invariant for priv member
138
+ + merge-ort: extract handling of priv member into reusable function
139
+
140
+ The "ort" merge backend saw one bugfix for a crash that happens
141
+ when inner merge gets killed, and assorted code clean-ups.
142
+ source: <pull.1748.v2.git.1718766019.gitgitgadget@gmail.com>
143
+
144
+
145
+* gt/unit-test-oidmap (2024-07-03) 1 commit
146
+ (merged to 'next' on 2024-07-08 at 4e7394fc67)
147
+ + t: migrate helper/test-oidmap.c to unit-tests/t-oidmap.c
148
+
149
+ An existing test of oidmap API has been rewritten with the
150
+ unit-test framework.
151
+ source: <20240703062958.23262-2-shyamthakkar001@gmail.com>
152
+
153
+
154
+* jc/disable-push-nego-for-deletion (2024-07-02) 1 commit
155
+ (merged to 'next' on 2024-07-08 at 18411fb8ac)
156
+ + push: avoid showing false negotiation errors
157
+
158
+ "git push" that pushes only deletion gave an unnecessary and
159
+ harmless error message when push negotiation is configured, which
160
has been corrected.
161
+ source: <xmqqo77fr2h0.fsf@gitster.g>
162
94
- Will merge to 'next'.
95
- source: <pull.1760.v2.git.1720739496.gitgitgadget@gmail.com>
163
164
+* jc/where-is-bash-for-ci (2024-07-08) 1 commit
165
+ (merged to 'next' on 2024-07-09 at 14b00e672e)
166
+ + ci: unify bash calling convention
167
98
-* kn/ci-clang-format (2024-07-11) 8 commits
99
- - check-whitespace: detect if no base_commit is provided
100
- - ci: run style check on GitHub and GitLab
101
- - clang-format: formalize some of the spacing rules
102
- - clang-format: avoid braces on simple single-statement bodies
103
- - clang-format: replace deprecated option with 'SpacesInParens'
104
- - clang-format: ensure files end with newlines
105
- - clang-format: avoid spacing around bitfield colon
106
- - clang-format: indent preprocessor directives after hash
168
+ Shell script clean-up.
169
+ source: <xmqqwmlvcx9g.fsf_-_@gitster.g>
170
108
- A CI job that use clang-format to check coding style issues in new
109
- code has been added.
171
111
- What's the doneness of this one?
112
- source: <20240711083043.1732288-1-karthik.188@gmail.com>
172
+* jk/tests-without-dns (2024-06-26) 3 commits
173
+ (merged to 'next' on 2024-07-08 at 21af592457)
174
+ + t/lib-bundle-uri: use local fake bundle URLs
175
+ + t5551: do not confirm that bogus url cannot be used
176
+ + t5553: use local url for invalid fetch
177
178
+ Test suite has been taught not to unnecessarily rely on DNS failing
179
+ a bogus external name.
180
+ source: <20240626205355.GA1009060@coredump.intra.peff.net>
181
115
-* ps/doc-http-empty-cookiefile (2024-07-11) 1 commit
116
- - doc: update http.cookieFile with in-memory cookie processing
182
118
- What happens when http.cookieFile gets the special value "" has
119
- been clarified in the documentation..
183
+* mh/userdiff-typescript (2024-07-15) 1 commit
184
+ - userdiff: add builtin diff driver for TypeScript language
185
121
- Will merge to 'next'.
122
- source: <pull.1733.v2.git.git.1720687008915.gitgitgadget@gmail.com>
186
+ With known shortcomings.
187
+ cf. <20240716122112.zqauqgxmng2tk2j6@archP14s>
188
+ source: <pull.1746.git.git.1721061218993.gitgitgadget@gmail.com>
189
190
125
-* rj/add-p-pager (2024-07-12) 4 commits
126
- - add-patch: render hunks through the pager
127
- - pager: introduce wait_for_pager
128
- - pager: do not close fd 2 unnecessarily
129
- - add-patch: test for 'p' command
191
+* ri/doc-show-branch-fix (2024-07-08) 1 commit
192
+ (merged to 'next' on 2024-07-08 at efcb154dfe)
193
+ + doc: fix the max number of branches shown by "show-branch"
194
+
195
+ Docfix.
196
+ source: <pull.1757.v5.git.1720444080034.gitgitgadget@gmail.com>
197
131
- A 'P' command to "git add -p" that passes the patch hunk to the
132
- pager has been added.
198
134
- Expecting a (hopefully small and final) reroll.
135
- cf. <803b10ed-1cb3-4314-82c9-cf48d5d0bb90@gmail.com>
136
- source: <2653fb37-c8a8-49b1-a804-4be6654a2cad@gmail.com>
199
+* rj/t0612-no-longer-leaks (2024-07-01) 1 commit
200
+ (merged to 'next' on 2024-07-08 at a63b027a20)
201
+ + t0612: mark as leak-free
202
203
+ A test that no longer leaks has been marked as such.
204
+ source: <86427b9e-9574-4e61-890a-691779a8da82@gmail.com>
205
139
-* js/unit-test-oidtree-cmake-fix (2024-07-12) 1 commit
140
- - cmake: fix build of `t-oidtree`
206
142
- Build fix.
207
+* rj/t0613-no-longer-leaks (2024-07-01) 1 commit
208
+ (merged to 'next' on 2024-07-08 at b6149c3032)
209
+ + t0613: mark as leak-free
210
+
211
+ A test that no longer leaks has been marked as such.
212
+ source: <23d41343-54fd-46c6-9d78-369e8009fa0b@gmail.com>
213
+
214
+
215
+* rs/clang-format-updates (2024-07-06) 1 commit
216
+ (merged to 'next' on 2024-07-08 at d2b5b41844)
217
+ + clang-format: include kh_foreach* macros in ForEachMacros
218
+
219
+ Custom control structures we invented more recently have been
220
+ taught to the clang-format file.
221
+ source: <4e7893f5-2dd9-46cf-8a64-cf780f4e1730@web.de>
222
+
223
+
224
+* tb/dev-build-pedantic-fix (2024-07-06) 1 commit
225
+ (merged to 'next' on 2024-07-08 at 7f34cc6c5b)
226
+ + config.mak.dev: fix typo when enabling -Wpedantic
227
+
228
+ Developer build procedure fix.
229
+ source: <cbc9446b1b0f2453b96aa9c0d89b9ec086a619bd.1720205457.git.me@ttaylorr.com>
230
+
231
+--------------------------------------------------
232
+[New Topics]
233
+
234
+* ew/cat-file-optim (2024-07-15) 10 commits
235
+ - cat-file: use writev(2) if available
236
+ - cat-file: batch_write: use size_t for length
237
+ - cat-file: batch-command uses content_limit
238
+ - object_info: content_limit only applies to blobs
239
+ - packfile: packed_object_info avoids packed_to_object_type
240
+ - cat-file: use delta_base_cache entries directly
241
+ - packfile: inline cache_or_unpack_entry
242
+ - packfile: fix off-by-one in content_limit comparison
243
+ - packfile: allow content-limit for cat-file
244
+ - packfile: move sizep computation
245
+
246
+ "git cat-file --batch" has been optimized.
247
+
248
+ Needs review.
249
+ source: <20240715003519.2671385-1-e@80x24.org>
250
+
251
+
252
+* jc/document-use-of-local (2024-07-15) 1 commit
253
+ - doc: note that AT&T ksh does not work with our test suite
254
+
255
+ Doc update.
256
+
257
+ Needs review.
258
+ source: <xmqq1q3u8zmr.fsf@gitster.g>
259
+
260
+
261
+* jt/doc-post-receive-hook-update (2024-07-15) 1 commit
262
+ - doc: clarify post-receive hook behavior
263
+
264
+ Doc update.
265
266
Will merge to 'next'.
145
- source: <pull.1761.git.1720816450344.gitgitgadget@gmail.com>
267
+ source: <20240714194626.29512-2-jltobler@gmail.com>
268
+
269
+
270
+* ch/refs-without-the-repository-fix (2024-07-16) 1 commit
271
+ - refs: correct the version numbers in a comment
272
+
273
+ Comment fix.
274
+
275
+ Will merge to 'next'.
276
+ source: <20240716095544.65931-1-list@eworm.de>
277
+
278
+
279
+* jc/reflog-expire-lookup-commit-fix (2024-07-16) 1 commit
280
+ - Revert "reflog expire: don't use lookup_commit_reference_gently()"
281
+
282
+ "git reflog expire" failed to honor annotated tags when computing
283
+ reachable commits.
284
+
285
+ Needs review.
286
+ source: <xmqqv8156rh2.fsf@gitster.g>
287
288
--------------------------------------------------
289
[Stalled]
290
150
-* cp/unit-test-reftable-tree (2024-06-13) 5 commits
291
+* cp/unit-test-reftable-tree (2024-07-16) 6 commits
292
+ - SQUASH?????
293
- t-reftable-tree: improve the test for infix_walk()
294
- t-reftable-tree: add test for non-existent key
295
- t-reftable-tree: split test_tree() into two sub-test functions
@@ -158,26 +300,26 @@ Release tarballs are available at:
300
framework.
301
302
Needs review.
161
- source: <20240612130217.8877-1-chandrapratap3519@gmail.com>
303
+ source: <20240716075641.4264-1-chandrapratap3519@gmail.com>
304
305
164
-* sj/ref-fsck (2024-07-10) 10 commits
306
+* sj/ref-fsck (2024-07-15) 10 commits
307
- fsck: add ref content check for files backend
308
- fsck: add ref name check for files backend
309
- files-backend: add unified interface for refs scanning
310
- builtin/fsck: add `git-refs verify` child process
169
- - builtin/refs: add verify subcommand and verbose_refs for "fsck_options"
311
+ - git refs: add verify subcommand
312
- refs: set up ref consistency check infrastructure
313
- fsck: add refs-related error report function
172
- - fsck: add a unified interface for reporting fsck messages
314
- fsck: rename objects-related fsck error functions
315
+ - fsck: add a unified interface for reporting fsck messages
316
- fsck: rename "skiplist" to "skip_oids"
317
318
"git fsck" infrastructure has been taught to also check the sanity
319
of the ref database, in addition to the object database.
320
321
Needs review.
180
- source: <Zo6eJi8BePrQxTQV@ArchLinux>
322
+ source: <ZpPEdmUN1Z5tqbK3@ArchLinux>
323
324
325
* cp/unit-test-reftable-pq (2024-06-14) 7 commits
@@ -223,32 +365,6 @@ Release tarballs are available at:
365
source: <cover.1717715060.git.me@ttaylorr.com>
366
367
226
-* vd/mktree (2024-06-20) 17 commits
227
- - mktree: remove entries when mode is 0
228
- - mktree: allow deeper paths in input
229
- - mktree: optionally add to an existing tree
230
- - mktree: add directory-file conflict hashmap
231
- - mktree: use iterator struct to add tree entries to index
232
- - mktree: create tree using an in-core index
233
- - mktree: overwrite duplicate entries
234
- - mktree: validate paths more carefully
235
- - mktree: add a --literally option
236
- - mktree.c: do not fail on mismatched submodule type
237
- - mktree: use read_index_info to read stdin lines
238
- - index-info.c: parse object type in provided in read_index_info
239
- - index-info.c: return unrecognized lines to caller
240
- - update-index: generalize 'read_index_info'
241
- - mktree: use non-static tree_entry array
242
- - mktree: rename treeent to tree_entry
243
- - mktree: use OPT_BOOL
244
-
245
- "git mktree" has been rewritten, taking advantage of the cache-tree
246
- API.
247
-
248
- Will merge to 'next'?
249
- source: <pull.1746.v2.git.1718834285.gitgitgadget@gmail.com>
250
-
251
-
368
* pp/add-parse-range-unit-test (2024-05-27) 1 commit
369
- apply: add unit tests for parse_range
370
@@ -274,35 +390,107 @@ Release tarballs are available at:
390
--------------------------------------------------
391
[Cooking]
392
277
-* jc/where-is-bash-for-ci (2024-07-08) 1 commit
278
- (merged to 'next' on 2024-07-09 at 14b00e672e)
279
- + ci: unify bash calling convention
393
+* es/doc-platform-support-policy (2024-07-12) 1 commit
394
+ - Documentation: add platform support policy
395
+
396
+ A policy document that describes platform support levels and
397
+ expectation on platform stakeholders has been introduced.
398
+
399
+ Needs review response.
400
+ cf. <xmqqed7ylbna.fsf@gitster.g>
401
+ source: <20240711232413.693444-1-emilyshaffer@google.com>
402
281
- Shell script clean-up.
403
+
404
+* js/var-git-shell-path (2024-07-13) 7 commits
405
+ (merged to 'next' on 2024-07-15 at 2e5b0eea39)
406
+ + var(win32): do report the GIT_SHELL_PATH that is actually used
407
+ + run-command: declare the `git_shell_path()` function globally
408
+ + run-command(win32): resolve the path to the Unix shell early
409
+ + mingw(is_msys2_sh): handle forward slashes in the `sh.exe` path, too
410
+ + win32: override `fspathcmp()` with a directory separator-aware version
411
+ + strvec: declare the `strvec_push_nodup()` function globally
412
+ + run-command: refactor getting the Unix shell path into its own function
413
+
414
+ "git var GIT_SHELL_PATH" should report the path to the shell used
415
+ to spawn external commands, but it didn't do so on Windows, which
416
+ has been corrected.
417
418
Will merge to 'master'.
284
- source: <xmqqwmlvcx9g.fsf_-_@gitster.g>
419
+ source: <pull.1760.v3.git.1720904905.gitgitgadget@gmail.com>
420
+
421
+
422
+* kn/ci-clang-format (2024-07-15) 7 commits
423
+ - check-whitespace: detect if no base_commit is provided
424
+ - ci: run style check on GitHub and GitLab
425
+ - clang-format: formalize some of the spacing rules
426
+ - clang-format: replace deprecated option with 'SpacesInParens'
427
+ - clang-format: ensure files end with newlines
428
+ - clang-format: avoid spacing around bitfield colon
429
+ - clang-format: indent preprocessor directives after hash
430
+
431
+ A CI job that use clang-format to check coding style issues in new
432
+ code has been added.
433
+
434
+ Needs review response.
435
+ cf. <xmqqle224npf.fsf@gitster.g>
436
+ source: <20240715093047.49321-1-karthik.188@gmail.com>
437
+
438
+
439
+* ps/doc-http-empty-cookiefile (2024-07-11) 1 commit
440
+ (merged to 'next' on 2024-07-13 at 801dcb5a35)
441
+ + doc: update http.cookieFile with in-memory cookie processing
442
+
443
+ What happens when http.cookieFile gets the special value "" has
444
+ been clarified in the documentation..
445
+
446
+ Will merge to 'master'.
447
+ source: <pull.1733.v2.git.git.1720687008915.gitgitgadget@gmail.com>
448
+
449
+
450
+* rj/add-p-pager (2024-07-15) 4 commits
451
+ - add-patch: render hunks through the pager
452
+ - pager: introduce wait_for_pager
453
+ - pager: do not close fd 2 unnecessarily
454
+ - add-patch: test for 'p' command
455
+
456
+ A 'P' command to "git add -p" that passes the patch hunk to the
457
+ pager has been added.
458
+
459
+ Needs fixing CI breakage.
460
+ cf. <xmqqttgqyzwa.fsf@gitster.g>
461
+ source: <a70bddd4-ef2d-488e-a2cf-48515f5df357@gmail.com>
462
+
463
+
464
+* js/unit-test-oidtree-cmake-fix (2024-07-12) 1 commit
465
+ (merged to 'next' on 2024-07-15 at d7aac9004c)
466
+ + cmake: fix build of `t-oidtree`
467
+
468
+ Build fix.
469
+
470
+ Will merge to 'master'.
471
+ source: <pull.1761.git.1720816450344.gitgitgadget@gmail.com>
472
473
474
* kn/push-empty-fix (2024-07-12) 1 commit
288
- - builtin/push: call set_refspecs after validating remote
475
+ (merged to 'next' on 2024-07-13 at 74598adb55)
476
+ + builtin/push: call set_refspecs after validating remote
477
478
"git push '' HEAD:there" used to hit a BUG(); it has been corrected
479
to die with "fatal: bad repository ''".
480
293
- Will merge to 'next'.
481
+ Will merge to 'master'.
482
source: <20240711093954.20317-1-karthik.188@gmail.com>
483
484
297
-* ad/merge-with-diff-algorithm (2024-07-10) 1 commit
298
- (merged to 'next' on 2024-07-11 at 2a221341d9)
485
+* ad/merge-with-diff-algorithm (2024-07-13) 1 commit
486
+ (merged to 'next' on 2024-07-16 at 90fe5aff4d)
487
+ merge-recursive: honor diff.algorithm
488
489
Many Porcelain commands that internally use the merge machinery
490
were taught to consistently honor the diff.algorithm configuration.
491
492
Will merge to 'master'.
305
- source: <pull.1743.v2.git.git.1720551701648.gitgitgadget@gmail.com>
493
+ source: <pull.1743.v3.git.git.1720889507066.gitgitgadget@gmail.com>
494
495
496
* jc/http-cookiefile (2024-07-09) 1 commit
@@ -317,18 +505,6 @@ Release tarballs are available at:
505
source: <xmqqed82cgmj.fsf@gitster.g>
506
507
320
-* jk/add-patch-with-suppress-blank-empty (2024-07-10) 1 commit
321
- (merged to 'next' on 2024-07-11 at cec8ebb668)
322
- + add-patch: handle splitting hunks with diff.suppressBlankEmpty
323
-
324
- When the diff.suppressBlankEmpty configuration variable is set,
325
- "git add -p" failed to process a patch with an unmodified empty
326
- line, which has been corrected.
327
-
328
- Will merge to 'master'.
329
- source: <20240710093610.GA2076910@coredump.intra.peff.net>
330
-
331
-
508
* jc/checkout-no-op-switch-errors (2024-07-02) 1 commit
509
- checkout: special case error messages during noop switching
510
@@ -341,31 +517,6 @@ Release tarballs are available at:
517
source: <xmqqikxnqzz4.fsf@gitster.g>
518
519
344
-* jc/disable-push-nego-for-deletion (2024-07-02) 1 commit
345
- (merged to 'next' on 2024-07-08 at 18411fb8ac)
346
- + push: avoid showing false negotiation errors
347
-
348
- "git push" that pushes only deletion gave an unnecessary and
349
- harmless error message when push negotiation is configured, which
350
- has been corrected.
351
-
352
- Will merge to 'master'.
353
- source: <xmqqo77fr2h0.fsf@gitster.g>
354
-
355
-
356
-* bc/gitfaq-more (2024-07-09) 4 commits
357
- (merged to 'next' on 2024-07-10 at eeec4009e4)
358
- + doc: mention that proxies must be completely transparent
359
- + gitfaq: add entry about syncing working trees
360
- + gitfaq: give advice on using eol attribute in gitattributes
361
- + gitfaq: add documentation on proxies
362
-
363
- A handful of entries are added to the GitFAQ document.
364
-
365
- Will merge to 'master'.
366
- source: <20240709233746.445860-1-sandals@crustytoothpaste.net>
367
-
368
-
520
* cp/unit-test-reftable-merged (2024-07-12) 7 commits
521
- t-reftable-merged: add test for REFTABLE_FORMAT_ERROR
522
- t-reftable-merged: use reftable_ref_record_equal to compare ref records
@@ -377,61 +528,24 @@ Release tarballs are available at:
528
529
Another reftable test has been ported to use the unit test framework.
530
380
- Looking good.
531
+ Will merge to 'next'?
532
source: <20240712055041.6476-1-chandrapratap3519@gmail.com>
533
534
384
-* ds/advice-sparse-index-expansion (2024-07-08) 1 commit
385
- (merged to 'next' on 2024-07-09 at c821020b13)
386
- + advice: warn when sparse index expands
387
-
388
- A new warning message is issued when a command has to expand a
389
- sparse index to handle working tree cruft that are outside of the
390
- sparse checkout.
391
-
392
- Will merge to 'master'.
393
- source: <pull.1756.v2.git.1720448038745.gitgitgadget@gmail.com>
394
-
395
-
396
-* am/gitweb-feed-use-committer-date (2024-07-07) 1 commit
397
- (merged to 'next' on 2024-07-08 at 65215ab842)
398
- + gitweb: rss/atom change published/updated date to committer date
399
-
400
- GitWeb update to use committer date consistently in rss/atom feeds.
401
-
402
- Will merge to 'master'.
403
- source: <20240707184813.33166-1-080ariel@gmail.com>
404
-
405
-
406
-* rs/clang-format-updates (2024-07-06) 1 commit
407
- (merged to 'next' on 2024-07-08 at d2b5b41844)
408
- + clang-format: include kh_foreach* macros in ForEachMacros
409
-
410
- Custom control structures we invented more recently have been
411
- taught to the clang-format file.
412
-
413
- Will merge to 'master'.
414
- source: <4e7893f5-2dd9-46cf-8a64-cf780f4e1730@web.de>
415
-
416
-
417
-* rs/t-strvec-use-test-msg (2024-07-06) 1 commit
535
+* rs/t-strvec-use-test-msg (2024-07-16) 3 commits
536
+ (merged to 'next' on 2024-07-16 at 3e860b3f12)
537
+ + t-strvec: fix type mismatch in check_strvec
538
+ (merged to 'next' on 2024-07-15 at f26e434515)
539
+ + t-strvec: improve check_strvec() output
540
(merged to 'next' on 2024-07-08 at c28c2553de)
541
+ t-strvec: use test_msg()
542
543
Unit test clean-up.
544
545
Will merge to 'master'.
546
+ source: <35b0ba6b-d485-44f2-a19f-3ce816f8b435@web.de>
547
source: <983be396-f47c-4573-8c33-af8367f8ddbe@web.de>
425
-
426
-
427
-* tb/dev-build-pedantic-fix (2024-07-06) 1 commit
428
- (merged to 'next' on 2024-07-08 at 7f34cc6c5b)
429
- + config.mak.dev: fix typo when enabling -Wpedantic
430
-
431
- Developer build procedure fix.
432
-
433
- Will merge to 'master'.
434
- source: <cbc9446b1b0f2453b96aa9c0d89b9ec086a619bd.1720205457.git.me@ttaylorr.com>
548
+ source: <1521ed89-989e-452b-b7fc-9e73672e0764@web.de>
549
550
551
* gt/unit-test-hashmap (2024-07-12) 1 commit
@@ -444,27 +558,6 @@ Release tarballs are available at:
558
source: <20240711235159.5320-1-shyamthakkar001@gmail.com>
559
560
447
-* ri/doc-show-branch-fix (2024-07-08) 1 commit
448
- (merged to 'next' on 2024-07-08 at efcb154dfe)
449
- + doc: fix the max number of branches shown by "show-branch"
450
-
451
- Docfix.
452
-
453
- Will merge to 'master'.
454
- source: <pull.1757.v5.git.1720444080034.gitgitgadget@gmail.com>
455
-
456
-
457
-* gt/unit-test-oidmap (2024-07-03) 1 commit
458
- (merged to 'next' on 2024-07-08 at 4e7394fc67)
459
- + t: migrate helper/test-oidmap.c to unit-tests/t-oidmap.c
460
-
461
- An existing test of oidmap API has been rewritten with the
462
- unit-test framework.
463
-
464
- Will merge to 'master'.
465
- source: <20240703062958.23262-2-shyamthakkar001@gmail.com>
466
-
467
-
561
* jk/test-body-in-here-doc (2024-07-10) 10 commits
562
(merged to 'next' on 2024-07-11 at 854733cffc)
563
+ t/.gitattributes: ignore whitespace in chainlint expect files
@@ -485,26 +578,6 @@ Release tarballs are available at:
578
source: <20240710083416.GA2060328@coredump.intra.peff.net>
579
580
488
-* rj/t0612-no-longer-leaks (2024-07-01) 1 commit
489
- (merged to 'next' on 2024-07-08 at a63b027a20)
490
- + t0612: mark as leak-free
491
-
492
- A test that no longer leaks has been marked as such.
493
-
494
- Will merge to 'master'.
495
- source: <86427b9e-9574-4e61-890a-691779a8da82@gmail.com>
496
-
497
-
498
-* rj/t0613-no-longer-leaks (2024-07-01) 1 commit
499
- (merged to 'next' on 2024-07-08 at b6149c3032)
500
- + t0613: mark as leak-free
501
-
502
- A test that no longer leaks has been marked as such.
503
-
504
- Will merge to 'master'.
505
- source: <23d41343-54fd-46c6-9d78-369e8009fa0b@gmail.com>
506
-
507
-
581
* rj/test-sanitize-leak-log-fix (2024-07-11) 2 commits
582
(merged to 'next' on 2024-07-11 at 9961f42025)
583
+ test-lib: GIT_TEST_SANITIZE_LEAK_LOG enabled by default
@@ -534,75 +607,6 @@ Release tarballs are available at:
607
source: <85b6b8a9-ee5f-42ab-bcbc-49976b30ef33@web.de>
608
609
537
-* cp/unit-test-reftable-record (2024-07-02) 11 commits
538
- (merged to 'next' on 2024-07-08 at b534dac338)
539
- + t-reftable-record: add tests for reftable_log_record_compare_key()
540
- + t-reftable-record: add tests for reftable_ref_record_compare_name()
541
- + t-reftable-record: add index tests for reftable_record_is_deletion()
542
- + t-reftable-record: add obj tests for reftable_record_is_deletion()
543
- + t-reftable-record: add log tests for reftable_record_is_deletion()
544
- + t-reftable-record: add ref tests for reftable_record_is_deletion()
545
- + t-reftable-record: add comparison tests for obj records
546
- + t-reftable-record: add comparison tests for index records
547
- + t-reftable-record: add comparison tests for ref records
548
- + t-reftable-record: add reftable_record_cmp() tests for log records
549
- + t: move reftable/record_test.c to the unit testing framework
550
-
551
- A test in reftable library has been rewritten using the unit test
552
- framework.
553
-
554
- Will merge to 'master'.
555
- cf. <CAOLa=ZT_x1Kf7EopU+RbBFzX3EPU5NWx6f8L9Uw=sM0MbCXDAQ@mail.gmail.com>
556
- source: <20240702074906.5587-1-chandrapratap3519@gmail.com>
557
-
558
-
559
-* as/describe-broken-refresh-index-fix (2024-06-26) 1 commit
560
- (merged to 'next' on 2024-07-08 at 2307a4a4ae)
561
- + describe: refresh the index when 'broken' flag is used
562
-
563
- "git describe --dirty --broken" forgot to refresh the index before
564
- seeing if there is any chang, ("git describe --dirty" correctly did
565
- so), which has been corrected.
566
-
567
- Will merge to 'master'.
568
- source: <20240626190801.68472-1-abhijeet.nkt@gmail.com>
569
-
570
-
571
-* cb/send-email-sanitize-trailer-addresses (2024-07-01) 1 commit
572
- (merged to 'next' on 2024-07-09 at 442a99106a)
573
- + git-send-email: use sanitized address when reading mbox body
574
-
575
- Address-looking strings found on the trailer are now placed on the
576
- Cc: list after running through sanitize_address.
577
-
578
- Will merge to 'master'.
579
- source: <20240701090115.56957-1-csokas.bence@prolan.hu>
580
-
581
-
582
-* jk/tests-without-dns (2024-06-26) 3 commits
583
- (merged to 'next' on 2024-07-08 at 21af592457)
584
- + t/lib-bundle-uri: use local fake bundle URLs
585
- + t5551: do not confirm that bogus url cannot be used
586
- + t5553: use local url for invalid fetch
587
-
588
- Test suite has been taught not to unnecessarily rely on DNS failing
589
- a bogus external name.
590
-
591
- Will merge to 'master'.
592
- source: <20240626205355.GA1009060@coredump.intra.peff.net>
593
-
594
-
595
-* bc/http-proactive-auth (2024-07-09) 1 commit
596
- (merged to 'next' on 2024-07-10 at 29b050bf0e)
597
- + http: allow authenticating proactively
598
-
599
- The http transport can now be told to send request with
600
- authentication material without first getting a 401 response.
601
-
602
- Will merge to 'master'.
603
- source: <20240710000155.947377-2-sandals@crustytoothpaste.net>
604
-
605
-
610
* jc/patch-id (2024-06-21) 5 commits
611
- patch-id: tighten code to detect the patch header
612
- patch-id: rewrite code that detects the beginning of a patch
@@ -617,21 +621,52 @@ Release tarballs are available at:
621
Needs review.
622
source: <20240621231826.3280338-1-gitster@pobox.com>
623
624
+--------------------------------------------------
625
+[Discarded]
626
621
-* en/ort-inner-merge-error-fix (2024-07-06) 8 commits
622
- (merged to 'next' on 2024-07-09 at 74bdae0b3b)
623
- + merge-ort: fix missing early return
624
- (merged to 'next' on 2024-06-28 at a85fe270e6)
625
- + merge-ort: convert more error() cases to path_msg()
626
- + merge-ort: upon merge abort, only show messages causing the abort
627
- + merge-ort: loosen commented requirements
628
- + merge-ort: clearer propagation of failure-to-function from merge_submodule
629
- + merge-ort: fix type of local 'clean' var in handle_content_merge ()
630
- + merge-ort: maintain expected invariant for priv member
631
- + merge-ort: extract handling of priv member into reusable function
627
+* jk/add-patch-with-suppress-blank-empty (2024-07-10) 1 commit
628
+ (merged to 'next' on 2024-07-11 at cec8ebb668)
629
+ + add-patch: handle splitting hunks with diff.suppressBlankEmpty
630
633
- The "ort" merge backend saw one bugfix for a crash that happens
634
- when inner merge gets killed, and assorted code clean-ups.
631
+ When the diff.suppressBlankEmpty configuration variable is set,
632
+ "git add -p" failed to process a patch with an unmodified empty
633
+ line, which has been corrected.
634
+
635
+ Reverted out of 'next'.
636
+ source: <20240710093610.GA2076910@coredump.intra.peff.net>
637
+
638
+
639
+* vd/mktree (2024-06-20) 17 commits
640
+ . mktree: remove entries when mode is 0
641
+ . mktree: allow deeper paths in input
642
+ . mktree: optionally add to an existing tree
643
+ . mktree: add directory-file conflict hashmap
644
+ . mktree: use iterator struct to add tree entries to index
645
+ . mktree: create tree using an in-core index
646
+ . mktree: overwrite duplicate entries
647
+ . mktree: validate paths more carefully
648
+ . mktree: add a --literally option
649
+ . mktree.c: do not fail on mismatched submodule type
650
+ . mktree: use read_index_info to read stdin lines
651
+ . index-info.c: parse object type in provided in read_index_info
652
+ . index-info.c: return unrecognized lines to caller
653
+ . update-index: generalize 'read_index_info'
654
+ . mktree: use non-static tree_entry array
655
+ . mktree: rename treeent to tree_entry
656
+ . mktree: use OPT_BOOL
657
+
658
+ "git mktree" has been rewritten, taking advantage of the cache-tree
659
+ API.
660
+
661
+ Retracted for now.
662
+ cf. <047b889e-fa6d-4c4a-b486-0bc80922c4ca@github.com>
663
+ source: <pull.1746.v2.git.1718834285.gitgitgadget@gmail.com>
664
+
665
+
666
+* mh/userdiff-typescript (2024-07-15) 1 commit
667
+ . userdiff: add builtin diff driver for TypeScript language
668
+
669
+ Retracted for now.
670
+ cf. <20240716193344.bjb62zsfnrfw3ngf@archP14s>
671
+ source: <pull.1746.git.git.1721061218993.gitgitgadget@gmail.com>
672
636
- Will merge to 'master'.
637
- source: <pull.1748.v2.git.1718766019.gitgitgadget@gmail.com>