What's cooking (2024/07 #01)
Junio C Hamano committed
Jul 2, 2024 at 11:18 UTC
22684c295da010cd8fe161af6e01792de9c99b46
1 file changed
+236
-260
whats-cooking.txt
+236
-260
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jun 2024, #09; Fri, 28)
3
-X-master-at: 790a17fb19d6eadd16c52e5d284a5c6921744766
4
-X-next-at: a6f4998532677456b59359a9ed4ffb96862a90a1
2
+Subject: What's cooking in git.git (Jul 2024, #01; Tue, 2)
3
+X-master-at: 06e570c0dfb2a2deb64d217db78e2ec21672f558
4
+X-next-at: 49e7a77208d3c1ef14056111881a0b2281e7abbe
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jun 2024, #09; Fri, 28)
7
+What's cooking in git.git (Jul 2024, #01; Tue, 2)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,98 +48,214 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* jk/fetch-pack-fsck-wo-lock-pack (2024-06-20) 1 commit
52
- (merged to 'next' on 2024-06-20 at c8c41abe07)
53
- + fetch-pack: fix segfault when fscking without --lock-pack
51
+* ew/cat-file-unbuffered-tests (2024-06-20) 2 commits
52
+ (merged to 'next' on 2024-06-24 at d605297495)
53
+ + t1006: ensure cat-file info isn't buffered by default
54
+ + Git.pm: use array in command_bidi_pipe example
55
+
56
+ The output from "git cat-file --batch-check" and "--batch-command
57
+ (info)" should not be unbuffered, for which some tests have been
58
+ added.
59
+ source: <20240617104326.3522535-1-e@80x24.org>
60
+ source: <20240618213041.M462972@dcvr>
61
55
- "git fetch-pack -k -k" without passing "--lock-pack" (which we
56
- never do ourselves) did not work at all, which has been corrected.
57
- source: <20240619130256.GA228005@coredump.intra.peff.net>
62
+
63
+* ew/object-convert-leakfix (2024-06-24) 1 commit
64
+ (merged to 'next' on 2024-06-25 at f87bf4a18f)
65
+ + object-file: fix leak on conversion failure
66
+
67
+ Leakfix.
68
+ source: <20240622043648.M78681@dcvr>
69
70
60
-* jk/t5500-typofix (2024-06-20) 1 commit
61
- (merged to 'next' on 2024-06-20 at cf953645e3)
62
- + t5500: fix mistaken $SERVER reference in helper function
71
+* jc/fuzz-sans-curl (2024-06-21) 1 commit
72
+ (merged to 'next' on 2024-06-25 at 80f85c6e4c)
73
+ + fuzz: minimum fuzzers environment lacks libcURL
74
64
- A helper function shared between two tests had a copy-paste bug,
65
- which has been corrected.
66
- source: <20240619125255.GA346466@coredump.intra.peff.net>
75
+ CI job to build minimum fuzzers learned to pass NO_CURL=NoThanks to
76
+ the build procedure, as its build environment does not offer, or
77
+ the rest of the build needs, anything cURL.
78
+ source: <xmqqwmmhimxx.fsf@gitster.g>
79
80
69
-* js/mingw-remove-unused-extern-decl (2024-06-20) 1 commit
70
- (merged to 'next' on 2024-06-20 at 65b323930f)
71
- + mingw: drop bogus (and unneeded) declaration of `_pgmptr`
81
+* jk/remote-wo-url (2024-06-14) 11 commits
82
+ (merged to 'next' on 2024-06-25 at f2b75a3507)
83
+ + remote: drop checks for zero-url case
84
+ + remote: always require at least one url in a remote
85
+ + t5801: test remote.*.vcs config
86
+ + t5801: make remote-testgit GIT_DIR setup more robust
87
+ + remote: allow resetting url list
88
+ + config: document remote.*.url/pushurl interaction
89
+ + remote: simplify url/pushurl selection
90
+ + remote: use strvecs to store remote url/pushurl
91
+ + remote: transfer ownership of memory in add_url(), etc
92
+ + remote: refactor alias_url() memory ownership
93
+ + archive: fix check for missing url
94
73
- An unused extern declaration for mingw has been removed to prevent
74
- it from causing build failure.
75
- source: <pull.1752.git.1718777398765.gitgitgadget@gmail.com>
95
+ Memory ownership rules for the in-core representation of
96
+ remote.*.url configuration values have been straightened out, which
97
+ resulted in a few leak fixes and code clarification.
98
+ source: <20240614102439.GA222287@coredump.intra.peff.net>
99
100
78
-* kz/merge-fail-early-upon-refresh-failure (2024-06-18) 1 commit
79
- (merged to 'next' on 2024-06-20 at 01d4bdd019)
80
- + merge: avoid write merge state when unable to write index
101
+* ps/use-the-repository (2024-06-14) 22 commits
102
+ (merged to 'next' on 2024-06-24 at ca97784ba8)
103
+ + hex: guard declarations with `USE_THE_REPOSITORY_VARIABLE`
104
+ + t/helper: remove dependency on `the_repository` in "proc-receive"
105
+ + t/helper: fix segfault in "oid-array" command without repository
106
+ + t/helper: use correct object hash in partial-clone helper
107
+ + compat/fsmonitor: fix socket path in networked SHA256 repos
108
+ + replace-object: use hash algorithm from passed-in repository
109
+ + protocol-caps: use hash algorithm from passed-in repository
110
+ + oidset: pass hash algorithm when parsing file
111
+ + http-fetch: don't crash when parsing packfile without a repo
112
+ + hash-ll: merge with "hash.h"
113
+ + refs: avoid include cycle with "repository.h"
114
+ + global: introduce `USE_THE_REPOSITORY_VARIABLE` macro
115
+ + hash: require hash algorithm in `empty_tree_oid_hex()`
116
+ + hash: require hash algorithm in `is_empty_{blob,tree}_oid()`
117
+ + hash: make `is_null_oid()` independent of `the_repository`
118
+ + hash: convert `oidcmp()` and `oideq()` to compare whole hash
119
+ + global: ensure that object IDs are always padded
120
+ + hash: require hash algorithm in `oidread()` and `oidclr()`
121
+ + hash: require hash algorithm in `hasheq()`, `hashcmp()` and `hashclr()`
122
+ + hash: drop (mostly) unused `is_empty_{blob,tree}_sha1()` functions
123
+ + Merge branch 'gt/unit-test-oidtree' into ps/use-the-repository
124
+ + Merge branch 'ps/ref-storage-migration' into ps/use-the-repository
125
82
- When "git merge" sees that the index cannot be refreshed (e.g. due
83
- to another process doing the same in the background), it died but
84
- after writing MERGE_HEAD etc. files, which was useless for the
85
- purpose to recover from the failure.
86
- source: <pull.1731.v6.git.1718593717745.gitgitgadget@gmail.com>
126
+ A CPP macro USE_THE_REPOSITORY_VARIABLE is introduced to help
127
+ transition the codebase to rely less on the availability of the
128
+ singleton the_repository instance.
129
+ source: <cover.1718347699.git.ps@pks.im>
130
131
89
-* rs/remove-unused-find-header-mem (2024-06-20) 1 commit
90
- (merged to 'next' on 2024-06-20 at 068c785d77)
91
- + commit: remove find_header_mem()
132
+* rb/build-options-w-lib-versions (2024-06-21) 3 commits
133
+ (merged to 'next' on 2024-06-25 at e20656d61f)
134
+ + version: teach --build-options to reports zlib version information
135
+ + version: teach --build-options to reports libcurl version information
136
+ (merged to 'next' on 2024-06-20 at b75df251ae)
137
+ + version: --build-options reports OpenSSL version information
138
93
- Code clean-up.
94
- source: <0d85712c-5beb-4a64-a7f4-797782c26694@web.de>
139
+ "git version --build-options" reports the version information of
140
+ OpenSSL and other libraries (if used) in the build.
141
+ source: <20240619172421.33548-1-randall.becker@nexbridge.ca>
142
+ source: <20240621180947.64419-1-randall.becker@nexbridge.ca>
143
+
144
+
145
+* rs/diff-color-moved-w-no-ext-diff-fix (2024-06-24) 1 commit
146
+ (merged to 'next' on 2024-06-25 at 73f48ab9a9)
147
+ + diff: allow --color-moved with --no-ext-diff
148
+
149
+ "git diff --no-ext-diff" when diff.external is configured ignored
150
+ the "--color-moved" option.
151
+ source: <fee1815c-80bb-42a4-97f3-d3f8e9b3a6ca@web.de>
152
153
--------------------------------------------------
154
[New Topics]
155
99
-* ss/doc-eol-attr-fix (2024-06-24) 1 commit
100
- (merged to 'next' on 2024-06-26 at 6b96672a5f)
101
- + doc: fix case error of eol attribute in example
156
+* as/pathspec-h-typofix (2024-07-01) 1 commit
157
+ (merged to 'next' on 2024-07-02 at ae7cee4189)
158
+ + pathspec: fix typo "glossary-context.txt" -> "glossary-content.txt"
159
103
- Doc update.
160
+ Typofix.
161
162
Will merge to 'master'.
106
- source: <pull.1736.git.git.1719178817386.gitgitgadget@gmail.com>
163
+ source: <20240629193137.54037-1-abhijeet.nkt@gmail.com>
164
165
109
-* as/describe-broken-refresh-index-fix (2024-06-26) 1 commit
110
- - describe: refresh the index when 'broken' flag is used
166
+* gt/unit-test-oidmap (2024-07-01) 1 commit
167
+ - t: migrate helper/test-oidmap.c to unit-tests/t-oidmap.c
168
112
- "git describe --dirty --broken" forgot to refresh the index before
113
- seeing if there is any chang, ("git describe --dirty" correctly did
114
- so), which has been corrected.
169
+ An existing test of oidmap API has been rewritten with the
170
+ unit-test framework.
171
172
Will merge to 'next'?
117
- source: <20240626190801.68472-1-abhijeet.nkt@gmail.com>
173
+ source: <20240628122030.41554-1-shyamthakkar001@gmail.com>
174
175
120
-* cb/send-email-sanitize-trailer-addresses (2024-06-28) 1 commit
121
- - git-send-email: Use sanitized address when reading mbox body
176
+* jk/test-body-in-here-doc (2024-07-01) 2 commits
177
+ - t: convert some here-doc test bodies
178
+ - test-lib: allow test snippets as here-docs
179
123
- Address-looking strings found on the trailer are now placed on the
124
- Cc: list after running through sanitize_address.
180
+ The test framework learns to take the test body not as a single
181
+ string but as a here-document.
182
126
- Expecting a hopefully small and final reroll.
127
- cf. <xmqq1q4g3lwh.fsf@gitster.g>
128
- source: <20240628085018.65076-2-csokas.bence@prolan.hu>
183
+ May need a matching change to shell script linter.
184
+ cf. <CAPig+cQdioTBinkacLFb7yktm168oB+qyP9MpZtTRE=1aBz5yg@mail.gmail.com>
185
+ source: <20240701220815.GA20293@coredump.intra.peff.net>
186
187
131
-* jk/tests-without-dns (2024-06-26) 3 commits
132
- - t/lib-bundle-uri: use local fake bundle URLs
133
- - t5551: do not confirm that bogus url cannot be used
134
- - t5553: use local url for invalid fetch
188
+* rj/t0612-no-longer-leaks (2024-07-01) 1 commit
189
+ - t0612: mark as leak-free
190
136
- source: <20240626205355.GA1009060@coredump.intra.peff.net>
191
+ A test that no longer leaks has been marked as such.
192
193
+ Will merge to 'next'.
194
+ source: <86427b9e-9574-4e61-890a-691779a8da82@gmail.com>
195
139
-* bc/http-proactive-auth (2024-06-28) 1 commit
140
- - http: allow authenticating proactively
196
142
- source: <20240628002742.3421311-2-sandals@crustytoothpaste.net>
197
+* rj/t0613-no-longer-leaks (2024-07-01) 1 commit
198
+ - t0613: mark as leak-free
199
+
200
+ A test that no longer leaks has been marked as such.
201
+
202
+ Will merge to 'next'.
203
+ source: <23d41343-54fd-46c6-9d78-369e8009fa0b@gmail.com>
204
+
205
+
206
+* rj/test-sanitize-leak-log-fix (2024-07-01) 1 commit
207
+ - test-lib: fix GIT_TEST_SANITIZE_LEAK_LOG
208
+
209
+ Tests that use GIT_TEST_SANITIZE_LEAK_LOG feature got their exit
210
+ status inverted, which has been corrected.
211
+
212
+ Will merge to 'next'?
213
+ source: <f4ae6e2a-218a-419c-b6c4-59a08be247a0@gmail.com>
214
+
215
+
216
+* rs/simplify-submodule-helper-super-prefix-invocation (2024-07-01) 1 commit
217
+ (merged to 'next' on 2024-07-02 at 06e1677920)
218
+ + submodule--helper: use strvec_pushf() for --super-prefix
219
+
220
+ Code clean-up.
221
+
222
+ Will merge to 'master'.
223
+ source: <fb79ebc4-5ecf-4257-ac2e-39f98db5649c@web.de>
224
+
225
+
226
+* rs/unit-tests-test-run (2024-07-01) 6 commits
227
+ - t-strbuf: use TEST_RUN
228
+ - t-strvec: use TEST_RUN
229
+ - t-reftable-basics: use TEST_RUN
230
+ - t-ctype: use TEST_RUN
231
+ - unit-tests: add TEST_RUN
232
+ - t0080: move expected output to a file
233
+
234
+ Unit-test framework clean-up.
235
+
236
+ Will merge to 'next'?
237
+ source: <85b6b8a9-ee5f-42ab-bcbc-49976b30ef33@web.de>
238
+
239
+
240
+* cp/unit-test-reftable-record (2024-07-02) 11 commits
241
+ - t-reftable-record: add tests for reftable_log_record_compare_key()
242
+ - t-reftable-record: add tests for reftable_ref_record_compare_name()
243
+ - t-reftable-record: add index tests for reftable_record_is_deletion()
244
+ - t-reftable-record: add obj tests for reftable_record_is_deletion()
245
+ - t-reftable-record: add log tests for reftable_record_is_deletion()
246
+ - t-reftable-record: add ref tests for reftable_record_is_deletion()
247
+ - t-reftable-record: add comparison tests for obj records
248
+ - t-reftable-record: add comparison tests for index records
249
+ - t-reftable-record: add comparison tests for ref records
250
+ - t-reftable-record: add reftable_record_cmp() tests for log records
251
+ - t: move reftable/record_test.c to the unit testing framework
252
+
253
+ A test in reftable library has been rewritten using the unit test
254
+ framework.
255
+
256
+ Will merge to 'next'.
257
+ cf. <CAOLa=ZT_x1Kf7EopU+RbBFzX3EPU5NWx6f8L9Uw=sM0MbCXDAQ@mail.gmail.com>
258
+ source: <20240702074906.5587-1-chandrapratap3519@gmail.com>
259
260
--------------------------------------------------
261
[Stalled]
@@ -158,25 +274,24 @@ Release tarballs are available at:
274
source: <20240612130217.8877-1-chandrapratap3519@gmail.com>
275
276
161
-* sj/ref-fsck (2024-06-27) 12 commits
162
- . fsck: add ref content check for files backend
163
- . fsck: add ref name check for files backend
164
- . files-backend: add unified interface for refs scanning
165
- . builtin/fsck: add `git-refs verify` child process
166
- . builtin/refs: add verify subcommand
167
- . refs: set up ref consistency check infrastructure
168
- . fsck: add "fsck_refs_options" initialization macros
169
- . fsck: add a unified interface for reporting fsck messages
170
- . fsck: add "fsck_refs_options" struct
171
- . fsck: abstract common options for reusing
172
- . fsck: use "fsck_configs" to set up configs
173
- . fsck: rename "fsck_options" to "fsck_objects_options"
277
+* sj/ref-fsck (2024-07-01) 11 commits
278
+ - fsck: add ref content check for files backend
279
+ - fsck: add ref name check for files backend
280
+ - files-backend: add unified interface for refs scanning
281
+ - builtin/fsck: add `git-refs verify` child process
282
+ - builtin/refs: add verify subcommand
283
+ - refs: set up ref consistency check infrastructure
284
+ - fsck: add "fsck_refs_options" initialization macros
285
+ - fsck: add a unified interface for reporting fsck messages
286
+ - fsck: add "fsck_refs_options" into "fsck_options"
287
+ - fsck: rename "skiplist" to "oid_skiplist"
288
+ - fsck: add "fsck_objects_options" to hold objects-related options
289
290
"git fsck" infrastructure has been taught to also check the sanity
291
of the ref database, in addition to the object database.
292
293
Needs review.
179
- source: <Zn2Ah3WDhtOmzrzn@ArchLinux>
294
+ source: <ZoLHtmOKTfxMSxvw@ArchLinux>
295
296
297
* cp/unit-test-reftable-pq (2024-06-14) 7 commits
@@ -244,7 +359,7 @@ Release tarballs are available at:
359
"git mktree" has been rewritten, taking advantage of the cache-tree
360
API.
361
247
- Will merge to 'next'.
362
+ Will merge to 'next'?
363
source: <pull.1746.v2.git.1718834285.gitgitgadget@gmail.com>
364
365
@@ -273,6 +388,51 @@ Release tarballs are available at:
388
--------------------------------------------------
389
[Cooking]
390
391
+* ss/doc-eol-attr-fix (2024-06-24) 1 commit
392
+ (merged to 'next' on 2024-06-26 at 6b96672a5f)
393
+ + doc: fix case error of eol attribute in example
394
+
395
+ Doc update.
396
+
397
+ Will merge to 'master'.
398
+ source: <pull.1736.git.git.1719178817386.gitgitgadget@gmail.com>
399
+
400
+
401
+* as/describe-broken-refresh-index-fix (2024-06-26) 1 commit
402
+ - describe: refresh the index when 'broken' flag is used
403
+
404
+ "git describe --dirty --broken" forgot to refresh the index before
405
+ seeing if there is any chang, ("git describe --dirty" correctly did
406
+ so), which has been corrected.
407
+
408
+ Will merge to 'next'?
409
+ source: <20240626190801.68472-1-abhijeet.nkt@gmail.com>
410
+
411
+
412
+* cb/send-email-sanitize-trailer-addresses (2024-07-01) 1 commit
413
+ - git-send-email: use sanitized address when reading mbox body
414
+
415
+ Address-looking strings found on the trailer are now placed on the
416
+ Cc: list after running through sanitize_address.
417
+
418
+ Will merge to 'next'?
419
+ source: <20240701090115.56957-1-csokas.bence@prolan.hu>
420
+
421
+
422
+* jk/tests-without-dns (2024-06-26) 3 commits
423
+ - t/lib-bundle-uri: use local fake bundle URLs
424
+ - t5551: do not confirm that bogus url cannot be used
425
+ - t5553: use local url for invalid fetch
426
+
427
+ source: <20240626205355.GA1009060@coredump.intra.peff.net>
428
+
429
+
430
+* bc/http-proactive-auth (2024-06-28) 1 commit
431
+ - http: allow authenticating proactively
432
+
433
+ source: <20240628002742.3421311-2-sandals@crustytoothpaste.net>
434
+
435
+
436
* ps/leakfixes-more (2024-06-11) 30 commits
437
(merged to 'next' on 2024-06-27 at 9550a05068)
438
+ builtin/blame: fix leaking ignore revs files
@@ -325,28 +485,6 @@ Release tarballs are available at:
485
source: <20240625231248.4070257-1-gitster@pobox.com>
486
487
328
-* jk/remote-wo-url (2024-06-14) 11 commits
329
- (merged to 'next' on 2024-06-25 at f2b75a3507)
330
- + remote: drop checks for zero-url case
331
- + remote: always require at least one url in a remote
332
- + t5801: test remote.*.vcs config
333
- + t5801: make remote-testgit GIT_DIR setup more robust
334
- + remote: allow resetting url list
335
- + config: document remote.*.url/pushurl interaction
336
- + remote: simplify url/pushurl selection
337
- + remote: use strvecs to store remote url/pushurl
338
- + remote: transfer ownership of memory in add_url(), etc
339
- + remote: refactor alias_url() memory ownership
340
- + archive: fix check for missing url
341
-
342
- Memory ownership rules for the in-core representation of
343
- remote.*.url configuration values have been straightened out, which
344
- resulted in a few leak fixes and code clarification.
345
-
346
- Will merge to 'master'.
347
- source: <20240614102439.GA222287@coredump.intra.peff.net>
348
-
349
-
488
* jc/archive-prefix-with-add-virtual-file (2024-06-26) 1 commit
489
(merged to 'next' on 2024-06-26 at da3ae88d56)
490
+ archive: document that --add-virtual-file takes full path
@@ -374,39 +512,6 @@ Release tarballs are available at:
512
source: <20240621231826.3280338-1-gitster@pobox.com>
513
514
377
-* jc/fuzz-sans-curl (2024-06-21) 1 commit
378
- (merged to 'next' on 2024-06-25 at 80f85c6e4c)
379
- + fuzz: minimum fuzzers environment lacks libcURL
380
-
381
- CI job to build minimum fuzzers learned to pass NO_CURL=NoThanks to
382
- the build procedure, as its build environment does not offer, or
383
- the rest of the build needs, anything cURL.
384
-
385
- Will merge to 'master'.
386
- source: <xmqqwmmhimxx.fsf@gitster.g>
387
-
388
-
389
-* ew/object-convert-leakfix (2024-06-24) 1 commit
390
- (merged to 'next' on 2024-06-25 at f87bf4a18f)
391
- + object-file: fix leak on conversion failure
392
-
393
- Leakfix.
394
-
395
- Will merge to 'master'.
396
- source: <20240622043648.M78681@dcvr>
397
-
398
-
399
-* rs/diff-color-moved-w-no-ext-diff-fix (2024-06-24) 1 commit
400
- (merged to 'next' on 2024-06-25 at 73f48ab9a9)
401
- + diff: allow --color-moved with --no-ext-diff
402
-
403
- "git diff --no-ext-diff" when diff.external is configured ignored
404
- the "--color-moved" option.
405
-
406
- Will merge to 'master'.
407
- source: <fee1815c-80bb-42a4-97f3-d3f8e9b3a6ca@web.de>
408
-
409
-
515
* ds/sparse-lstat-caching (2024-06-28) 5 commits
516
(merged to 'next' on 2024-06-28 at 9efaea181d)
517
+ sparse-index: improve lstat caching of sparse paths
@@ -423,21 +528,6 @@ Release tarballs are available at:
528
source: <pull.1754.v3.git.1719578605.gitgitgadget@gmail.com>
529
530
426
-* rb/build-options-w-lib-versions (2024-06-21) 3 commits
427
- (merged to 'next' on 2024-06-25 at e20656d61f)
428
- + version: teach --build-options to reports zlib version information
429
- + version: teach --build-options to reports libcurl version information
430
- (merged to 'next' on 2024-06-20 at b75df251ae)
431
- + version: --build-options reports OpenSSL version information
432
-
433
- "git version --build-options" reports the version information of
434
- OpenSSL and other libraries (if used) in the build.
435
-
436
- Will merge to 'master'.
437
- source: <20240619172421.33548-1-randall.becker@nexbridge.ca>
438
- source: <20240621180947.64419-1-randall.becker@nexbridge.ca>
439
-
440
-
531
* rj/pager-die-upon-exec-failure (2024-06-25) 1 commit
532
(merged to 'next' on 2024-06-26 at bfb6361ca8)
533
+ pager: die when paging to non-existing command
@@ -451,53 +541,6 @@ Release tarballs are available at:
541
source: <392deded-9eb2-42fa-b6f9-54c22d3ffd33@gmail.com>
542
543
454
-* ew/cat-file-unbuffered-tests (2024-06-20) 2 commits
455
- (merged to 'next' on 2024-06-24 at d605297495)
456
- + t1006: ensure cat-file info isn't buffered by default
457
- + Git.pm: use array in command_bidi_pipe example
458
-
459
- The output from "git cat-file --batch-check" and "--batch-command
460
- (info)" should not be unbuffered, for which some tests have been
461
- added.
462
-
463
- Will merge to 'master'.
464
- source: <20240617104326.3522535-1-e@80x24.org>
465
- source: <20240618213041.M462972@dcvr>
466
-
467
-
468
-* ps/use-the-repository (2024-06-14) 22 commits
469
- (merged to 'next' on 2024-06-24 at ca97784ba8)
470
- + hex: guard declarations with `USE_THE_REPOSITORY_VARIABLE`
471
- + t/helper: remove dependency on `the_repository` in "proc-receive"
472
- + t/helper: fix segfault in "oid-array" command without repository
473
- + t/helper: use correct object hash in partial-clone helper
474
- + compat/fsmonitor: fix socket path in networked SHA256 repos
475
- + replace-object: use hash algorithm from passed-in repository
476
- + protocol-caps: use hash algorithm from passed-in repository
477
- + oidset: pass hash algorithm when parsing file
478
- + http-fetch: don't crash when parsing packfile without a repo
479
- + hash-ll: merge with "hash.h"
480
- + refs: avoid include cycle with "repository.h"
481
- + global: introduce `USE_THE_REPOSITORY_VARIABLE` macro
482
- + hash: require hash algorithm in `empty_tree_oid_hex()`
483
- + hash: require hash algorithm in `is_empty_{blob,tree}_oid()`
484
- + hash: make `is_null_oid()` independent of `the_repository`
485
- + hash: convert `oidcmp()` and `oideq()` to compare whole hash
486
- + global: ensure that object IDs are always padded
487
- + hash: require hash algorithm in `oidread()` and `oidclr()`
488
- + hash: require hash algorithm in `hasheq()`, `hashcmp()` and `hashclr()`
489
- + hash: drop (mostly) unused `is_empty_{blob,tree}_sha1()` functions
490
- + Merge branch 'gt/unit-test-oidtree' into ps/use-the-repository
491
- + Merge branch 'ps/ref-storage-migration' into ps/use-the-repository
492
-
493
- A CPP macro USE_THE_REPOSITORY_VARIABLE is introduced to help
494
- transition the codebase to rely less on the availability of the
495
- singleton the_repository instance.
496
-
497
- Will merge to 'master'.
498
- source: <cover.1718347699.git.ps@pks.im>
499
-
500
-
544
* en/ort-inner-merge-error-fix (2024-06-20) 7 commits
545
(merged to 'next' on 2024-06-28 at a85fe270e6)
546
+ merge-ort: convert more error() cases to path_msg()
@@ -555,70 +598,3 @@ Release tarballs are available at:
598
599
Will merge to 'master'.
600
source: <cover.1719333276.git.me@ttaylorr.com>
558
-
559
---------------------------------------------------
560
-[Discarded]
561
-
562
-* rj/add-p-pager (2024-06-04) 6 commits
563
- . add-patch: introduce the command '|'
564
- . test-terminal: introduce --no-stdin-pty
565
- . pager: introduce setup_custom_pager
566
- . pager: introduce wait_for_pager
567
- . pager: do not close fd 2 unnecessarily
568
- . add-patch: test for 'p' command
569
-
570
- "git add -i" and friends learned a new '|' command that sends the
571
- current hunk to the pager, instead of dumping it to the terminal.
572
-
573
- Expecting a reroll to work well with jk/am-retry
574
- source: <1ef0ac3a-3be5-4fc2-93f8-46610f3d1880@gmail.com>
575
-
576
-
577
-* jc/rerere-cleanup (2023-08-25) 4 commits
578
- . rerere: modernize use of empty strbuf
579
- . rerere: try_merge() should use LL_MERGE_ERROR when it means an error
580
- . rerere: fix comment on handle_file() helper
581
- . rerere: simplify check_one_conflict() helper function
582
-
583
- Code clean-up.
584
-
585
- Discarded.
586
- source: <20230824205456.1231371-1-gitster@pobox.com>
587
-
588
-
589
-* ie/config-includeif-hostname (2024-03-19) 2 commits
590
- . config: learn the "hostname:" includeIf condition
591
- . t: add a test helper for getting hostname
592
-
593
- The conditional inclusion mechanism for configuration files learned
594
- to switch on the hostname.
595
-
596
- Has been in the "Expecting a reroll." state for too long.
597
- cf. <20240319210428.GC1159535@coredump.intra.peff.net>
598
- cf. <20240320001934.GA903718@coredump.intra.peff.net>
599
- source: <20240319183722.211300-1-ignacio@iencinas.com>
600
-
601
-
602
-* bk/complete-dirname-for-am-and-format-patch (2024-01-12) 1 commit
603
- . completion: dir-type optargs for am, format-patch
604
-
605
- Command line completion support (in contrib/) has been
606
- updated for a few commands to complete directory names where a
607
- directory name is expected.
608
-
609
- Has been in the "Expecting a reroll." state for too long.
610
- cf. <40c3a824-a961-490b-94d4-4eb23c8f713d@gmail.com>
611
- cf. <6683f24e-7e56-489d-be2d-8afe1fc38d2b@gmail.com>
612
- source: <d37781c3-6af2-409b-95a8-660a9b92d20b@smtp-relay.sendinblue.com>
613
-
614
-
615
-* bk/complete-send-email (2024-01-12) 1 commit
616
- . completion: don't complete revs when --no-format-patch
617
-
618
- Command line completion support (in contrib/) has been taught to
619
- avoid offering revision names as candidates to "git send-email" when
620
- the command is used to send pre-generated files.
621
-
622
- Has been in the "Expecting a reroll." state for too long.
623
- cf. <CAC4O8c88Z3ZqxH2VVaNPpEGB3moL5dJcg3cOWuLWwQ_hLrJMtA@mail.gmail.com>
624
- source: <a718b5ee-afb0-44bd-a299-3208fac43506@smtp-relay.sendinblue.com>