What's cooking (2024/07 #06)
Junio C Hamano committed
Jul 18, 2024 at 09:51 UTC
9d39a965d61dba42ad82831e017dd34622f0e5e5
1 file changed
+160
-344
whats-cooking.txt
+160
-344
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2024, #05; Tue, 16)
3
-X-master-at: 04f5a52757cd92347271e24f7cbdfe15dafce3b7
4
-X-next-at: 44c27ab58a06e5c08647e891ceb89879d1423b71
2
+Subject: What's cooking in git.git (Jul 2024, #06; Thu, 18)
3
+X-master-at: d19b6cd2dd72dc811f19df4b32c7ed223256c3ee
4
+X-next-at: 9752f9e123323e801511d405efab0fe0db92f038
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jul 2024, #05; Tue, 16)
7
+What's cooking in git.git (Jul 2024, #06; Thu, 18)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,6 +17,12 @@ 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-rc1 has been tagged. From now on until the final release,
21
+which is planned to happen near the end of this month, please make
22
+sure you place priorities on finding and fixing new regressions
23
+introduced during this cycle over finding and fixing old bugs, over
24
+any shiny new features.
25
+
26
Copies of the source code to Git live in many repositories, and the
27
following is a list of the ones I push into or their mirrors. Some
28
repositories have only a subset of branches.
@@ -48,242 +54,139 @@ Release tarballs are available at:
54
--------------------------------------------------
55
[Graduated to 'master']
56
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
-
55
- GitWeb update to use committer date consistently in rss/atom feeds.
56
- source: <20240707184813.33166-1-080ariel@gmail.com>
57
-
58
-
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
-
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
-* 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
-
76
- A handful of entries are added to the GitFAQ document.
77
- source: <20240709233746.445860-1-sandals@crustytoothpaste.net>
78
-
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
-
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
-
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
57
+* ch/refs-without-the-repository-fix (2024-07-16) 1 commit
58
+ (merged to 'next' on 2024-07-17 at 89f907db0d)
59
+ + refs: correct the version numbers in a comment
60
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>
61
+ Comment fix.
62
+ source: <20240716095544.65931-1-list@eworm.de>
63
64
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
65
+* jc/http-cookiefile (2024-07-09) 1 commit
66
+ (merged to 'next' on 2024-07-11 at abdd5711d2)
67
+ + http.c: cookie file tightening
68
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>
69
+ The http.cookieFile and http.saveCookies configuration variables
70
+ have a few values that need to be avoided, which are now ignored
71
+ with warning messages.
72
+ source: <xmqqed82cgmj.fsf@gitster.g>
73
74
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
75
+* jk/am-retry (2024-07-17) 1 commit
76
+ (merged to 'next' on 2024-07-17 at 012d05db3b)
77
+ + t4153: stop redirecting input from /dev/zero
78
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>
79
+ Test fix as a follow-up to an already graduated topic.
80
+ source: <20240717070050.GG547635@coredump.intra.peff.net>
81
82
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
83
+* jk/test-body-in-here-doc (2024-07-10) 10 commits
84
+ (merged to 'next' on 2024-07-11 at 854733cffc)
85
+ + t/.gitattributes: ignore whitespace in chainlint expect files
86
+ + t: convert some here-doc test bodies
87
+ + test-lib: allow test snippets as here-docs
88
+ + chainlint.pl: add tests for test body in heredoc
89
+ + chainlint.pl: recognize test bodies defined via heredoc
90
+ + chainlint.pl: check line numbers in expected output
91
+ + chainlint.pl: force CRLF conversion when opening input files
92
+ + chainlint.pl: do not spawn more threads than we have scripts
93
+ + chainlint.pl: only start threads if jobs > 1
94
+ + chainlint.pl: add test_expect_success call to test snippets
95
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>
96
+ The test framework learns to take the test body not as a single
97
+ string but as a here-document.
98
+ source: <20240710083416.GA2060328@coredump.intra.peff.net>
99
100
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
101
+* js/unit-test-oidtree-cmake-fix (2024-07-12) 1 commit
102
+ (merged to 'next' on 2024-07-15 at d7aac9004c)
103
+ + cmake: fix build of `t-oidtree`
104
149
- An existing test of oidmap API has been rewritten with the
150
- unit-test framework.
151
- source: <20240703062958.23262-2-shyamthakkar001@gmail.com>
105
+ Build fix.
106
+ source: <pull.1761.git.1720816450344.gitgitgadget@gmail.com>
107
108
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
109
+* js/var-git-shell-path (2024-07-13) 7 commits
110
+ (merged to 'next' on 2024-07-15 at 2e5b0eea39)
111
+ + var(win32): do report the GIT_SHELL_PATH that is actually used
112
+ + run-command: declare the `git_shell_path()` function globally
113
+ + run-command(win32): resolve the path to the Unix shell early
114
+ + mingw(is_msys2_sh): handle forward slashes in the `sh.exe` path, too
115
+ + win32: override `fspathcmp()` with a directory separator-aware version
116
+ + strvec: declare the `strvec_push_nodup()` function globally
117
+ + run-command: refactor getting the Unix shell path into its own function
118
158
- "git push" that pushes only deletion gave an unnecessary and
159
- harmless error message when push negotiation is configured, which
119
+ "git var GIT_SHELL_PATH" should report the path to the shell used
120
+ to spawn external commands, but it didn't do so on Windows, which
121
has been corrected.
161
- source: <xmqqo77fr2h0.fsf@gitster.g>
162
-
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
-
168
- Shell script clean-up.
169
- source: <xmqqwmlvcx9g.fsf_-_@gitster.g>
170
-
171
-
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
-
182
-
183
-* mh/userdiff-typescript (2024-07-15) 1 commit
184
- - userdiff: add builtin diff driver for TypeScript language
185
-
186
- With known shortcomings.
187
- cf. <20240716122112.zqauqgxmng2tk2j6@archP14s>
188
- source: <pull.1746.git.git.1721061218993.gitgitgadget@gmail.com>
189
-
190
-
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
-
198
-
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
-
122
+ source: <pull.1760.v3.git.1720904905.gitgitgadget@gmail.com>
123
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
124
211
- A test that no longer leaks has been marked as such.
212
- source: <23d41343-54fd-46c6-9d78-369e8009fa0b@gmail.com>
125
+* kn/push-empty-fix (2024-07-12) 1 commit
126
+ (merged to 'next' on 2024-07-13 at 74598adb55)
127
+ + builtin/push: call set_refspecs after validating remote
128
129
+ "git push '' HEAD:there" used to hit a BUG(); it has been corrected
130
+ to die with "fatal: bad repository ''".
131
+ source: <20240711093954.20317-1-karthik.188@gmail.com>
132
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
133
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>
134
+* ps/doc-http-empty-cookiefile (2024-07-11) 1 commit
135
+ (merged to 'next' on 2024-07-13 at 801dcb5a35)
136
+ + doc: update http.cookieFile with in-memory cookie processing
137
138
+ What happens when http.cookieFile gets the special value "" has
139
+ been clarified in the documentation..
140
+ source: <pull.1733.v2.git.git.1720687008915.gitgitgadget@gmail.com>
141
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
142
228
- Developer build procedure fix.
229
- source: <cbc9446b1b0f2453b96aa9c0d89b9ec086a619bd.1720205457.git.me@ttaylorr.com>
143
+* ps/pseudo-ref-terminology (2024-07-17) 1 commit
144
+ (merged to 'next' on 2024-07-17 at 8886abf078)
145
+ + Documentation/glossary: fix double word
146
231
---------------------------------------------------
232
-[New Topics]
147
+ Doc update.
148
+ source: <20240717105432.2801097-2-martin.agren@gmail.com>
149
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
150
246
- "git cat-file --batch" has been optimized.
151
+* rj/test-sanitize-leak-log-fix (2024-07-11) 2 commits
152
+ (merged to 'next' on 2024-07-11 at 9961f42025)
153
+ + test-lib: GIT_TEST_SANITIZE_LEAK_LOG enabled by default
154
+ (merged to 'next' on 2024-07-08 at c7ee7d03e1)
155
+ + test-lib: fix GIT_TEST_SANITIZE_LEAK_LOG
156
248
- Needs review.
249
- source: <20240715003519.2671385-1-e@80x24.org>
157
+ Tests that use GIT_TEST_SANITIZE_LEAK_LOG feature got their exit
158
+ status inverted, which has been corrected.
159
+ source: <f4ae6e2a-218a-419c-b6c4-59a08be247a0@gmail.com>
160
+ source: <fe8cd0d1-e451-43d0-b033-11bbb6d1ed56@gmail.com>
161
162
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
163
+* tb/doc-max-tree-depth-fix (2024-07-17) 1 commit
164
+ (merged to 'next' on 2024-07-17 at cdfc7a4f7b)
165
+ + Documentation: fix default value for core.maxTreeDepth
166
167
Doc update.
256
-
257
- Needs review.
258
- source: <xmqq1q3u8zmr.fsf@gitster.g>
168
+ source: <57610d9ca635b6c76b9af5b3d3f346a9bc7621be.1721222249.git.me@ttaylorr.com>
169
170
261
-* jt/doc-post-receive-hook-update (2024-07-15) 1 commit
262
- - doc: clarify post-receive hook behavior
171
+* tb/pseudo-merge-reachability-bitmap (2024-07-17) 1 commit
172
+ (merged to 'next' on 2024-07-17 at f11cc8586a)
173
+ + Documentation/gitpacking: make sample configs listing blocks
174
175
Doc update.
176
+ source: <20240717105432.2801097-1-martin.agren@gmail.com>
177
266
- Will merge to 'next'.
267
- source: <20240714194626.29512-2-jltobler@gmail.com>
268
-
178
+--------------------------------------------------
179
+[New Topics]
180
270
-* ch/refs-without-the-repository-fix (2024-07-16) 1 commit
271
- - refs: correct the version numbers in a comment
181
+* rj/make-cleanup (2024-07-18) 2 commits
182
+ - config.mak.uname: remove unused uname_P variable
183
+ - Makefile: drop -Wno-universal-initializer from SP_EXTRA_FLAGS
184
273
- Comment fix.
185
+ A build tweak knob has been simplified by not setting the value
186
+ that is already the default; another unused one has been removed.
187
188
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>
189
+ source: <0d132370-3e07-4332-bcfb-c4450100d736@ramsayjones.plus.com>
190
191
--------------------------------------------------
192
[Stalled]
@@ -338,7 +241,7 @@ Release tarballs are available at:
241
source: <20240614095136.12052-1-chandrapratap3519@gmail.com>
242
243
341
-* tb/incremental-midx-part-1 (2024-06-07) 19 commits
244
+* tb/incremental-midx-part-1 (2024-07-17) 19 commits
245
- midx: implement support for writing incremental MIDX chains
246
- t/t5313-pack-bounds-checks.sh: prepare for sub-directories
247
- t: retire 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP'
@@ -362,7 +265,7 @@ Release tarballs are available at:
265
Incremental updates of multi-pack index files.
266
267
Needs review.
365
- source: <cover.1717715060.git.me@ttaylorr.com>
268
+ source: <cover.1721250704.git.me@ttaylorr.com>
269
270
271
* pp/add-parse-range-unit-test (2024-05-27) 1 commit
@@ -390,6 +293,53 @@ Release tarballs are available at:
293
--------------------------------------------------
294
[Cooking]
295
296
+* ew/cat-file-optim (2024-07-15) 10 commits
297
+ - cat-file: use writev(2) if available
298
+ - cat-file: batch_write: use size_t for length
299
+ - cat-file: batch-command uses content_limit
300
+ - object_info: content_limit only applies to blobs
301
+ - packfile: packed_object_info avoids packed_to_object_type
302
+ - cat-file: use delta_base_cache entries directly
303
+ - packfile: inline cache_or_unpack_entry
304
+ - packfile: fix off-by-one in content_limit comparison
305
+ - packfile: allow content-limit for cat-file
306
+ - packfile: move sizep computation
307
+
308
+ "git cat-file --batch" has been optimized.
309
+
310
+ Needs review.
311
+ source: <20240715003519.2671385-1-e@80x24.org>
312
+
313
+
314
+* jc/document-use-of-local (2024-07-15) 1 commit
315
+ - doc: note that AT&T ksh does not work with our test suite
316
+
317
+ Doc update.
318
+
319
+ Needs review.
320
+ source: <xmqq1q3u8zmr.fsf@gitster.g>
321
+
322
+
323
+* jt/doc-post-receive-hook-update (2024-07-15) 1 commit
324
+ (merged to 'next' on 2024-07-17 at 624ac4ebe2)
325
+ + doc: clarify post-receive hook behavior
326
+
327
+ Doc update.
328
+
329
+ Will cook in 'next'.
330
+ source: <20240715183739.7808-1-jltobler@gmail.com>
331
+
332
+
333
+* jc/reflog-expire-lookup-commit-fix (2024-07-16) 1 commit
334
+ - Revert "reflog expire: don't use lookup_commit_reference_gently()"
335
+
336
+ "git reflog expire" failed to honor annotated tags when computing
337
+ reachable commits.
338
+
339
+ Needs review.
340
+ source: <xmqqv8156rh2.fsf@gitster.g>
341
+
342
+
343
* es/doc-platform-support-policy (2024-07-12) 1 commit
344
- Documentation: add platform support policy
345
@@ -401,50 +351,19 @@ Release tarballs are available at:
351
source: <20240711232413.693444-1-emilyshaffer@google.com>
352
353
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'.
419
- source: <pull.1760.v3.git.1720904905.gitgitgadget@gmail.com>
420
-
421
-
422
-* kn/ci-clang-format (2024-07-15) 7 commits
354
+* kn/ci-clang-format (2024-07-18) 6 commits
355
+ - ci/style-check: add `RemoveBracesLLVM` in CI job
356
- check-whitespace: detect if no base_commit is provided
357
- ci: run style check on GitHub and GitLab
358
- clang-format: formalize some of the spacing rules
426
- - clang-format: replace deprecated option with 'SpacesInParens'
427
- - clang-format: ensure files end with newlines
359
- clang-format: avoid spacing around bitfield colon
360
- clang-format: indent preprocessor directives after hash
361
362
A CI job that use clang-format to check coding style issues in new
363
code has been added.
364
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>
365
+ Will merge to 'next'.
366
+ source: <20240718081605.452366-1-karthik.188@gmail.com>
367
368
369
* rj/add-p-pager (2024-07-15) 4 commits
@@ -456,32 +375,11 @@ Release tarballs are available at:
375
A 'P' command to "git add -p" that passes the patch hunk to the
376
pager has been added.
377
459
- Needs fixing CI breakage.
460
- cf. <xmqqttgqyzwa.fsf@gitster.g>
378
+ Expecting a (hopefully small and final) reroll.
379
+ cf. <2b57479c-29c8-4a6e-b7b0-1309395cfbd9@gmail.com>
380
source: <a70bddd4-ef2d-488e-a2cf-48515f5df357@gmail.com>
381
382
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
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
-
481
- Will merge to 'master'.
482
- source: <20240711093954.20317-1-karthik.188@gmail.com>
483
-
484
-
383
* ad/merge-with-diff-algorithm (2024-07-13) 1 commit
384
(merged to 'next' on 2024-07-16 at 90fe5aff4d)
385
+ merge-recursive: honor diff.algorithm
@@ -489,22 +387,10 @@ Release tarballs are available at:
387
Many Porcelain commands that internally use the merge machinery
388
were taught to consistently honor the diff.algorithm configuration.
389
492
- Will merge to 'master'.
390
+ Will cook in 'next'.
391
source: <pull.1743.v3.git.git.1720889507066.gitgitgadget@gmail.com>
392
393
496
-* jc/http-cookiefile (2024-07-09) 1 commit
497
- (merged to 'next' on 2024-07-11 at abdd5711d2)
498
- + http.c: cookie file tightening
499
-
500
- The http.cookieFile and http.saveCookies configuration variables
501
- have a few values that need to be avoided, which are now ignored
502
- with warning messages.
503
-
504
- Will merge to 'master'.
505
- source: <xmqqed82cgmj.fsf@gitster.g>
506
-
507
-
394
* jc/checkout-no-op-switch-errors (2024-07-02) 1 commit
395
- checkout: special case error messages during noop switching
396
@@ -513,7 +399,7 @@ Release tarballs are available at:
399
correct, but found confusing by some users. It now says that the
400
user needs to give pathspec to specify what paths to checkout.
401
516
- Needs review.
402
+ Will merge to 'next'.
403
source: <xmqqikxnqzz4.fsf@gitster.g>
404
405
@@ -528,7 +414,7 @@ Release tarballs are available at:
414
415
Another reftable test has been ported to use the unit test framework.
416
531
- Will merge to 'next'?
417
+ Will merge to 'next'.
418
source: <20240712055041.6476-1-chandrapratap3519@gmail.com>
419
420
@@ -542,7 +428,7 @@ Release tarballs are available at:
428
429
Unit test clean-up.
430
545
- Will merge to 'master'.
431
+ Will cook in 'next'.
432
source: <35b0ba6b-d485-44f2-a19f-3ce816f8b435@web.de>
433
source: <983be396-f47c-4573-8c33-af8367f8ddbe@web.de>
434
source: <1521ed89-989e-452b-b7fc-9e73672e0764@web.de>
@@ -558,40 +444,6 @@ Release tarballs are available at:
444
source: <20240711235159.5320-1-shyamthakkar001@gmail.com>
445
446
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
564
- + t: convert some here-doc test bodies
565
- + test-lib: allow test snippets as here-docs
566
- + chainlint.pl: add tests for test body in heredoc
567
- + chainlint.pl: recognize test bodies defined via heredoc
568
- + chainlint.pl: check line numbers in expected output
569
- + chainlint.pl: force CRLF conversion when opening input files
570
- + chainlint.pl: do not spawn more threads than we have scripts
571
- + chainlint.pl: only start threads if jobs > 1
572
- + chainlint.pl: add test_expect_success call to test snippets
573
-
574
- The test framework learns to take the test body not as a single
575
- string but as a here-document.
576
-
577
- Will merge to 'master'.
578
- source: <20240710083416.GA2060328@coredump.intra.peff.net>
579
-
580
-
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
584
- (merged to 'next' on 2024-07-08 at c7ee7d03e1)
585
- + test-lib: fix GIT_TEST_SANITIZE_LEAK_LOG
586
-
587
- Tests that use GIT_TEST_SANITIZE_LEAK_LOG feature got their exit
588
- status inverted, which has been corrected.
589
-
590
- Will merge to 'master'.
591
- source: <f4ae6e2a-218a-419c-b6c4-59a08be247a0@gmail.com>
592
- source: <fe8cd0d1-e451-43d0-b033-11bbb6d1ed56@gmail.com>
593
-
594
-
447
* rs/unit-tests-test-run (2024-07-01) 6 commits
448
- t-strbuf: use TEST_RUN
449
- t-strvec: use TEST_RUN
@@ -634,39 +486,3 @@ Release tarballs are available at:
486
487
Reverted out of 'next'.
488
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
-