What's cooking (2024/06 #07)
Junio C Hamano committed
Jun 20, 2024 at 16:30 UTC
0524b14f52194a88761ba5ae3dcd176c0a9fa451
1 file changed
+250
-319
whats-cooking.txt
+250
-319
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jun 2024, #06; Mon, 17)
3
-X-master-at: 66ac6e4bcd111be3fa9c2a6b3fafea718d00678d
4
-X-next-at: 2facee476fbabb1bfffc7794f9acc62beb2b62dc
2
+Subject: What's cooking in git.git (Jun 2024, #07; Thu, 20)
3
+X-master-at: 9005149a4a77e2d3409c6127bf4fd1a0893c3495
4
+X-next-at: 4e1b14247adedf68e1c01a595e53106096e867db
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jun 2024, #06; Mon, 17)
7
+What's cooking in git.git (Jun 2024, #07; Thu, 20)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,172 +48,257 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* ap/credential-clear-fix (2024-06-06) 1 commit
52
- (merged to 'next' on 2024-06-07 at 933f06b899)
53
- + credential: clear expired c->credential, unify secret clearing
51
+* ds/ahead-behind-fix (2024-06-12) 1 commit
52
+ (merged to 'next' on 2024-06-13 at df378ec81e)
53
+ + commit-graph: increment progress indicator
54
55
- Upon expiration event, the credential subsystem forgot to clear
56
- in-core authentication material other than password (whose support
57
- was added recently), which has been corrected.
58
- source: <20240606183516.4077896-2-aplattner@nvidia.com>
55
+ Fix for a progress bar.
56
+ source: <pull.1743.git.1718118555197.gitgitgadget@gmail.com>
57
58
61
-* jc/format-patch-with-range-diff (2024-05-24) 2 commits
62
- (merged to 'next' on 2024-06-07 at 394989ee78)
63
- + format-patch: move range/inter diff at the end of a single patch output
64
- + show_log: factor out interdiff/range-diff generation
59
+* ds/doc-add-interactive-singlekey (2024-06-07) 1 commit
60
+ (merged to 'next' on 2024-06-12 at cf3de70246)
61
+ + doc: interactive.singleKey is disabled by default
62
66
- The inter/range-diff output has been moved to the end of the patch
67
- when format-patch adds it to a single patch, instead of writing it
68
- before the patch text, to be consistent with what is done for a
69
- cover letter for a multi-patch series.
70
- source: <20240523225007.2871766-1-gitster@pobox.com>
63
+ Doc update.
64
+ source: <xmqq4ja4e6d6.fsf@gitster.g>
65
66
73
-* jc/varargs-attributes (2024-06-10) 4 commits
74
- (merged to 'next' on 2024-06-10 at a9c55c0f89)
75
- + __attribute__: add a few missing format attributes
76
- + __attribute__: mark some functions with LAST_ARG_MUST_BE_NULL
77
- + __attribute__: remove redundant attribute declaration for git_die_config()
78
- + __attribute__: trace2_region_enter_printf() is like "printf"
67
+* gt/unit-test-oidtree (2024-06-12) 1 commit
68
+ (merged to 'next' on 2024-06-13 at eb3700b002)
69
+ + t/: migrate helper/test-oidtree.c to unit-tests/t-oidtree.c
70
+ (this branch is used by ps/use-the-repository.)
71
80
- Varargs functions that are unannotated as printf-like or execl-like
81
- have been annotated as such.
82
- source: <20240608183747.2084294-1-gitster@pobox.com>
72
+ "oidtree" tests were rewritten to use the unit test framework.
73
+ cf. <7o6fuymnfn6b6buyw3yyctjd4dlwlrazspv3xgxvys6djjivxh@qbhyurorgbtt>
74
+ source: <20240608165731.29467-1-shyamthakkar001@gmail.com>
75
76
85
-* jk/am-retry (2024-06-06) 2 commits
86
- (merged to 'next' on 2024-06-10 at 4d62361bc7)
87
- + test-terminal: drop stdin handling
88
- + am: add explicit "--retry" option
77
+* jc/heads-are-branches (2024-06-04) 3 commits
78
+ (merged to 'next' on 2024-06-14 at b56b59d1d7)
79
+ + show-ref: introduce --branches and deprecate --heads
80
+ + ls-remote: introduce --branches and deprecate --heads
81
+ + refs: call branches branches
82
90
- "git am" has a safety feature to prevent it from starting a new
91
- session when there already is a session going. It reliably
92
- triggers when a mbox is given on the command line, but it has to
93
- rely on the tty-ness of the standard input. Add an explicit way to
94
- opt out of this safety with a command line option.
95
- source: <20240606081724.GA1166769@coredump.intra.peff.net>
83
+ The "--heads" option of "ls-remote" and "show-ref" has been been
84
+ deprecated; "--branches" replaces "--heads".
85
+ source: <20240604220145.3260714-1-gitster@pobox.com>
86
87
98
-* jk/imap-send-plug-all-msgs-leak (2024-06-07) 3 commits
99
- (merged to 'next' on 2024-06-10 at 9b8ec7b97d)
100
- + imap-send: free all_msgs strbuf in "out" label
101
- + Merge branch 'jc/t1517-more' into jk/imap-send-plug-all-msgs-leak
102
- + Merge branch 'ps/no-writable-strings' into jk/imap-send-plug-all-msgs-leak
103
- (this branch uses ps/no-writable-strings.)
88
+* kn/update-ref-symref (2024-06-07) 8 commits
89
+ (merged to 'next' on 2024-06-13 at 5cf8d7513e)
90
+ + update-ref: add support for 'symref-update' command
91
+ + reftable: pick either 'oid' or 'target' for new updates
92
+ + update-ref: add support for 'symref-create' command
93
+ + update-ref: add support for 'symref-delete' command
94
+ + update-ref: add support for 'symref-verify' command
95
+ + refs: specify error for regular refs with `old_target`
96
+ + refs: create and use `ref_update_expects_existing_old_ref()`
97
+ + Merge branch 'kn/ref-transaction-symref' into kn/update-ref-symref
98
105
- A leak in "git imap-send" that somehow escapes LSan has been
106
- plugged.
107
- source: <20240605083526.GB2345232@coredump.intra.peff.net>
99
+ "git update-ref --stdin" learned to handle transactional updates of
100
+ symbolic-refs.
101
+ source: <20240607133304.2333280-1-knayak@gitlab.com>
102
103
110
-* ps/check-docs-fix (2024-06-06) 4 commits
111
- (merged to 'next' on 2024-06-10 at 12570afc8e)
112
- + ci/test-documentation: work around SyntaxWarning in Python 3.12
113
- + gitlab-ci: add job to run `make check-docs`
114
- + Documentation/lint-manpages: bubble up errors
115
- + Makefile: extract script to lint missing/extraneous manpages
104
+* ps/abbrev-length-before-setup-fix (2024-06-12) 3 commits
105
+ (merged to 'next' on 2024-06-13 at e5d17f7da2)
106
+ + object-name: don't try to abbreviate to lengths greater than hexsz
107
+ + parse-options-cb: stop clamping "--abbrev=" to hash length
108
+ + config: fix segfault when parsing "core.abbrev" without repo
109
117
- "make check-docs" noticed problems and reported to its output but
118
- failed to signal its findings with its exit status, which has been
110
+ Setting core.abbrev too early before the repository set-up
111
+ (typically in "git clone") caused segfault, which as been
112
corrected.
120
- source: <cover.1717660597.git.ps@pks.im>
121
-
122
-
123
-* ps/ci-fix-detection-of-ubuntu-20 (2024-06-06) 1 commit
124
- (merged to 'next' on 2024-06-10 at 2d6725a946)
125
- + ci: fix check for Ubuntu 20.04
126
-
127
- Fix for an embarrassing typo that prevented Python2 tests from running
128
- anywhere.
129
- source: <f91004a4382c95b1b87bf3d1aafc018af2b7b92e.1717662814.git.ps@pks.im>
130
-
131
-
132
-* ps/no-writable-strings (2024-06-07) 28 commits
133
- (merged to 'next' on 2024-06-10 at 9678851a9f)
134
- + config.mak.dev: enable `-Wwrite-strings` warning
135
- + builtin/merge: always store allocated strings in `pull_twohead`
136
- + builtin/rebase: always store allocated string in `options.strategy`
137
- + builtin/rebase: do not assign default backend to non-constant field
138
- + imap-send: fix leaking memory in `imap_server_conf`
139
- + imap-send: drop global `imap_server_conf` variable
140
- + mailmap: always store allocated strings in mailmap blob
141
- + revision: always store allocated strings in output encoding
142
- + remote-curl: avoid assigning string constant to non-const variable
143
- + send-pack: always allocate receive status
144
- + parse-options: cast long name for OPTION_ALIAS
145
- + http: do not assign string constant to non-const field
146
- + compat/win32: fix const-correctness with string constants
147
- + pretty: add casts for decoration option pointers
148
- + object-file: make `buf` parameter of `index_mem()` a constant
149
- + object-file: mark cached object buffers as const
150
- + ident: add casts for fallback name and GECOS
151
- + entry: refactor how we remove items for delayed checkouts
152
- + line-log: always allocate the output prefix
153
- + line-log: stop assigning string constant to file parent buffer
154
- + diff: cast string constant in `fill_textconv()`
155
- + builtin/remote: cast away constness in `get_head_names()`
156
- + refspec: remove global tag refspec structure
157
- + reftable: cast away constness when assigning constants to records
158
- + refs/reftable: stop micro-optimizing refname allocations on copy
159
- + global: convert intentionally-leaking config strings to consts
160
- + global: improve const correctness when assigning string constants
161
- + Merge branch 'ps/leakfixes' into ps/no-writable-strings
162
- (this branch is used by jk/imap-send-plug-all-msgs-leak.)
163
-
164
- Building with "-Werror -Wwrite-strings" is now supported.
165
- source: <cover.1717740365.git.ps@pks.im>
166
-
167
-
168
-* ps/ref-storage-migration (2024-06-06) 14 commits
169
- (merged to 'next' on 2024-06-10 at 81b46b6916)
170
- + builtin/refs: new command to migrate ref storage formats
171
- + refs: implement logic to migrate between ref storage formats
172
- + refs: implement removal of ref storages
173
- + worktree: don't store main worktree twice
174
- + reftable: inline `merged_table_release()`
175
- + refs/files: fix NULL pointer deref when releasing ref store
176
- + refs/files: extract function to iterate through root refs
177
- + refs/files: refactor `add_pseudoref_and_head_entries()`
178
- + refs: allow to skip creation of reflog entries
179
- + refs: pass storage format to `ref_store_init()` explicitly
180
- + refs: convert ref storage format to an enum
181
- + setup: unset ref storage when reinitializing repository version
182
- + Merge branch 'ps/pseudo-ref-terminology' into ps/ref-storage-migration
183
- + Merge branch 'ps/refs-without-the-repository-updates' into ps/ref-storage-migration
184
- (this branch is used by ps/use-the-repository and sj/ref-fsck.)
185
-
186
- A new command has been added to migrate a repository that uses the
187
- files backend for its ref storage to use the reftable backend, with
188
- limitations.
189
- source: <cover.1717649802.git.ps@pks.im>
113
+ source: <cover.1718178996.git.ps@pks.im>
114
+
115
+
116
+* ps/document-breaking-changes (2024-06-14) 4 commits
117
+ (merged to 'next' on 2024-06-14 at 8089bf6f81)
118
+ + BreakingChanges: document that we do not plan to deprecate git-checkout
119
+ + BreakingChanges: document removal of grafting
120
+ + BreakingChanges: document upcoming change from "sha1" to "sha256"
121
+ + docs: introduce document to announce breaking changes
122
+
123
+ The structure of the document that records longer-term project
124
+ decisions to deprecate/remove/update various behaviour has been
125
+ outlined.
126
+ source: <cover.1718345026.git.ps@pks.im>
127
+
128
+
129
+* ps/make-append-to-cflags (2024-06-11) 1 commit
130
+ (merged to 'next' on 2024-06-12 at d57b04bf16)
131
+ + Makefile: add ability to append to CFLAGS and LDFLAGS
132
+
133
+ To help developers, the build procedure now allows builders to use
134
+ CFLAGS_APPEND to specify additional CFLAGS.
135
+ source: <8120ddaf0bdfd50e0fc4cf9a04f833102630b639.1718001244.git.ps@pks.im>
136
+
137
+
138
+* pw/rebase-i-error-message (2024-05-30) 2 commits
139
+ (merged to 'next' on 2024-06-13 at dbec12cfda)
140
+ + rebase -i: improve error message when picking merge
141
+ + rebase -i: pass struct replay_opts to parse_insn_line()
142
+
143
+ When the user adds to "git rebase -i" instruction to "pick" a merge
144
+ commit, the error experience is not pleasant. Such an error is now
145
+ caught earlier in the process that parses the todo list.
146
+ source: <pull.1672.v3.git.1717076630.gitgitgadget@gmail.com>
147
+
148
+
149
+* rj/format-patch-auto-cover-with-interdiff (2024-06-07) 2 commits
150
+ (merged to 'next' on 2024-06-13 at 3fad4afcfd)
151
+ + format-patch: assume --cover-letter for diff in multi-patch series
152
+ + t4014: cleanups in a few tests
153
+
154
+ "git format-patch --interdiff" for multi-patch series learned to
155
+ turn on cover letters automatically (unless told never to enable
156
+ cover letter with "--no-cover-letter" and such).
157
+
158
+
159
+* rs/diff-exit-code-with-external-diff (2024-06-10) 3 commits
160
+ (merged to 'next' on 2024-06-12 at 9ce495b6cc)
161
+ + diff: let external diffs report that changes are uninteresting
162
+ + userdiff: add and use struct external_diff
163
+ + t4020: test exit code with external diffs
164
+
165
+ "git diff --exit-code --ext-diff" learned to take the exit status
166
+ of the external diff driver into account when deciding the exit
167
+ status of the overall "git diff" invocation when configured to do
168
+ so.
169
+ source: <168fecaa-2ebd-4897-b0ba-3bd2a37c01e7@web.de>
170
+
171
+
172
+* tb/multi-pack-reuse-fix (2024-06-11) 3 commits
173
+ (merged to 'next' on 2024-06-13 at 1cd0259667)
174
+ + pack-revindex.c: guard against out-of-bounds pack lookups
175
+ + pack-bitmap.c: avoid uninitialized `pack_int_id` during reuse
176
+ + midx-write.c: do not read existing MIDX with `packs_to_include`
177
+
178
+ Assorted fixes to multi-pack-index code paths.
179
+ source: <cover.1718126886.git.me@ttaylorr.com>
180
181
--------------------------------------------------
182
[New Topics]
183
194
-* ew/cat-file-unbuffered-tests (2024-06-17) 2 commits
195
- - t9700: ensure cat-file info isn't buffered by default
184
+* kz/merge-fail-early-upon-refresh-failure (2024-06-18) 1 commit
185
+ (merged to 'next' on 2024-06-20 at 01d4bdd019)
186
+ + merge: avoid write merge state when unable to write index
187
+
188
+ When "git merge" sees that the index cannot be refreshed (e.g. due
189
+ to another process doing the same in the background), it died but
190
+ after writing MERGE_HEAD etc. files, which was useless for the
191
+ purpose to recover from the failure.
192
+
193
+ Will merge to 'master'.
194
+ source: <pull.1731.v6.git.1718593717745.gitgitgadget@gmail.com>
195
+
196
+
197
+* ds/sparse-lstat-caching (2024-06-20) 5 commits
198
+ - sparse-index: improve lstat caching of sparse paths
199
+ - sparse-index: count lstat() calls
200
+ - sparse-index: use strbuf in path_found()
201
+ - sparse-index: refactor path_found()
202
+ - sparse-index: refactor skip worktree retry logic
203
+
204
+ The code to deal with modified paths that are out-of-cone in a
205
+ sparsely checked out working tree has been optimized.
206
+
207
+ Needs review.
208
+ source: <pull.1754.git.1718899877.gitgitgadget@gmail.com>
209
+
210
+
211
+* jk/fetch-pack-fsck-wo-lock-pack (2024-06-20) 1 commit
212
+ (merged to 'next' on 2024-06-20 at c8c41abe07)
213
+ + fetch-pack: fix segfault when fscking without --lock-pack
214
+
215
+ "git fetch-pack -k -k" without passing "--lock-pack" (which we
216
+ never do ourselves) did not work at all, which has been corrected.
217
+
218
+ Will merge to 'master'.
219
+ source: <20240619130256.GA228005@coredump.intra.peff.net>
220
+
221
+
222
+* jk/t5500-typofix (2024-06-20) 1 commit
223
+ (merged to 'next' on 2024-06-20 at cf953645e3)
224
+ + t5500: fix mistaken $SERVER reference in helper function
225
+
226
+ A helper function shared between two tests had a copy-paste bug,
227
+ which has been corrected.
228
+
229
+ Will merge to 'master'.
230
+ source: <20240619125255.GA346466@coredump.intra.peff.net>
231
+
232
+
233
+* js/mingw-remove-unused-extern-decl (2024-06-20) 1 commit
234
+ (merged to 'next' on 2024-06-20 at 65b323930f)
235
+ + mingw: drop bogus (and unneeded) declaration of `_pgmptr`
236
+
237
+ An unused extern declaration for mingw has been removed to prevent
238
+ it from causing build failure.
239
+
240
+ Will merge to 'master'.
241
+ source: <pull.1752.git.1718777398765.gitgitgadget@gmail.com>
242
+
243
+
244
+* rb/build-options-w-openssl (2024-06-20) 1 commit
245
+ (merged to 'next' on 2024-06-20 at b75df251ae)
246
+ + version: --build-options reports OpenSSL version information
247
+
248
+ "git version --build-options" reports the version information of
249
+ OpenSSL (if used) in the build.
250
+
251
+ Will merge to 'master'.
252
+ source: <20240619172421.33548-2-randall.becker@nexbridge.ca>
253
+
254
+
255
+* rj/pager-die-upon-exec-failure (2024-06-20) 1 commit
256
+ - pager: die when paging to non-existing command
257
+
258
+ When GIT_PAGER failed to spawn, depending on the code path taken,
259
+ we failed immediately (correct) or just spew the payload to the
260
+ standard output (incorrect). The code now always fail immediately
261
+ when GIT_PAGER fails.
262
+
263
+ Will merge to 'next'?
264
+ source: <f7106878-5ec5-4fe7-940b-2fb1d9707f7d@gmail.com>
265
+
266
+
267
+* rs/remove-unused-find-header-mem (2024-06-20) 1 commit
268
+ (merged to 'next' on 2024-06-20 at 068c785d77)
269
+ + commit: remove find_header_mem()
270
+
271
+ Code clean-up.
272
+
273
+ Will merge to 'master'.
274
+ source: <0d85712c-5beb-4a64-a7f4-797782c26694@web.de>
275
+
276
+--------------------------------------------------
277
+[Cooking]
278
+
279
+* ew/cat-file-unbuffered-tests (2024-06-20) 2 commits
280
+ - t1006: ensure cat-file info isn't buffered by default
281
- Git.pm: use array in command_bidi_pipe example
282
283
The output from "git cat-file --batch-check" and "--batch-command
284
(info)" should not be unbuffered, for which some tests have been
285
added.
286
202
- Waiting for response to review.
287
+ Will merge to 'next'.
288
source: <20240617104326.3522535-1-e@80x24.org>
289
+ source: <20240618213041.M462972@dcvr>
290
291
292
* kl/attr-read-attr-fromindex-msan-workaround (2024-06-17) 1 commit
207
- - attr: fix msan issue in read_attr_from_index
293
+ (merged to 'next' on 2024-06-18 at eebafb2d71)
294
+ + attr: fix msan issue in read_attr_from_index
295
296
Code clarification to avoid an appearance of using an uninitialized
297
variable.
298
212
- Will merge to 'next'?
299
+ Will merge to 'master'.
300
source: <pull.1747.git.1718654424683.gitgitgadget@gmail.com>
301
215
---------------------------------------------------
216
-[Cooking]
302
303
* cp/unit-test-reftable-tree (2024-06-13) 5 commits
304
- t-reftable-tree: improve the test for infix_walk()
@@ -252,47 +337,45 @@ Release tarballs are available at:
337
- hash: drop (mostly) unused `is_empty_{blob,tree}_sha1()` functions
338
- Merge branch 'gt/unit-test-oidtree' into ps/use-the-repository
339
- Merge branch 'ps/ref-storage-migration' into ps/use-the-repository
255
- (this branch uses gt/unit-test-oidtree.)
340
341
A CPP macro USE_THE_REPOSITORY_VARIABLE is introduced to help
342
transition the codebase to rely less on the availability of the
343
singleton the_repository instance.
344
261
- Needs review.
345
+ Will merge to 'next'.
346
source: <cover.1718347699.git.ps@pks.im>
347
348
265
-* sj/ref-fsck (2024-06-13) 8 commits
349
+* sj/ref-fsck (2024-06-20) 7 commits
350
- fsck: add ref content check for files backend
351
- fsck: add ref name check for files backend
352
- files-backend: add unified interface for refs scanning
353
- builtin/fsck: add `git-refs verify` child process
354
- builtin/refs: add verify subcommand
355
- refs: set up ref consistency check infrastructure
272
- - fsck: add refs check interfaces to interface with fsck error levels
273
- - Merge branch 'ps/ref-storage-migration' into sj/ref-fsck
356
+ - fsck: add refs check interfaces to interact with fsck error levels
357
358
"git fsck" infrastructure has been taught to also check the sanity
359
of the ref database, in addition to the object database.
360
361
Needs review.
279
- source: <20240612085349.710785-1-shejialuo@gmail.com>
362
+ source: <ZnKKy52QFO2UhqM6@ArchLinux>
363
364
282
-* en/ort-inner-merge-error-fix (2024-06-13) 7 commits
365
+* en/ort-inner-merge-error-fix (2024-06-20) 7 commits
366
- merge-ort: convert more error() cases to path_msg()
367
- merge-ort: upon merge abort, only show messages causing the abort
368
- merge-ort: loosen commented requirements
369
- merge-ort: clearer propagation of failure-to-function from merge_submodule
287
- - merge-ort: fix type of local 'clean' var in handle_content_merge()
370
+ - merge-ort: fix type of local 'clean' var in handle_content_merge ()
371
- merge-ort: maintain expected invariant for priv member
372
- merge-ort: extract handling of priv member into reusable function
373
374
The "ort" merge backend saw one bugfix for a crash that happens
375
when inner merge gets killed, and assorted code clean-ups.
376
294
- Waiting for comments or a reroll.
295
- source: <pull.1748.git.1718310307.gitgitgadget@gmail.com>
377
+ Needs review.
378
+ source: <pull.1748.v2.git.1718766019.gitgitgadget@gmail.com>
379
380
381
* cp/unit-test-reftable-pq (2024-06-14) 7 commits
@@ -398,28 +481,6 @@ Release tarballs are available at:
481
source: <cover.1717715060.git.me@ttaylorr.com>
482
483
401
-* ds/doc-add-interactive-singlekey (2024-06-07) 1 commit
402
- (merged to 'next' on 2024-06-12 at cf3de70246)
403
- + doc: interactive.singleKey is disabled by default
404
-
405
- Doc update.
406
-
407
- Will merge to 'master'.
408
- source: <xmqq4ja4e6d6.fsf@gitster.g>
409
-
410
-
411
-* gt/unit-test-oidtree (2024-06-12) 1 commit
412
- (merged to 'next' on 2024-06-13 at eb3700b002)
413
- + t/: migrate helper/test-oidtree.c to unit-tests/t-oidtree.c
414
- (this branch is used by ps/use-the-repository.)
415
-
416
- "oidtree" tests were rewritten to use the unit test framework.
417
-
418
- Will merge to 'master'.
419
- cf. <7o6fuymnfn6b6buyw3yyctjd4dlwlrazspv3xgxvys6djjivxh@qbhyurorgbtt>
420
- source: <20240608165731.29467-1-shyamthakkar001@gmail.com>
421
-
422
-
484
* jc/worktree-git-path (2024-06-08) 1 commit
485
(merged to 'next' on 2024-06-17 at a87c318e45)
486
+ worktree_git_path(): move the declaration to path.h
@@ -430,54 +491,7 @@ Release tarballs are available at:
491
source: <20240608183901.2084546-1-gitster@pobox.com>
492
493
433
-* ds/ahead-behind-fix (2024-06-12) 1 commit
434
- (merged to 'next' on 2024-06-13 at df378ec81e)
435
- + commit-graph: increment progress indicator
436
-
437
- Fix for a progress bar.
438
-
439
- Will merge to 'master'.
440
- source: <pull.1743.git.1718118555197.gitgitgadget@gmail.com>
441
-
442
-
443
-* ps/abbrev-length-before-setup-fix (2024-06-12) 3 commits
444
- (merged to 'next' on 2024-06-13 at e5d17f7da2)
445
- + object-name: don't try to abbreviate to lengths greater than hexsz
446
- + parse-options-cb: stop clamping "--abbrev=" to hash length
447
- + config: fix segfault when parsing "core.abbrev" without repo
448
-
449
- Setting core.abbrev too early before the repository set-up
450
- (typically in "git clone") caused segfault, which as been
451
- corrected.
452
-
453
- Will merge to 'master'.
454
- source: <cover.1718178996.git.ps@pks.im>
455
-
456
-
457
-* ps/make-append-to-cflags (2024-06-11) 1 commit
458
- (merged to 'next' on 2024-06-12 at d57b04bf16)
459
- + Makefile: add ability to append to CFLAGS and LDFLAGS
460
-
461
- To help developers, the build procedure now allows builders to use
462
- CFLAGS_APPEND to specify additional CFLAGS.
463
-
464
- Will merge to 'master'.
465
- source: <8120ddaf0bdfd50e0fc4cf9a04f833102630b639.1718001244.git.ps@pks.im>
466
-
467
-
468
-* tb/multi-pack-reuse-fix (2024-06-11) 3 commits
469
- (merged to 'next' on 2024-06-13 at 1cd0259667)
470
- + pack-revindex.c: guard against out-of-bounds pack lookups
471
- + pack-bitmap.c: avoid uninitialized `pack_int_id` during reuse
472
- + midx-write.c: do not read existing MIDX with `packs_to_include`
473
-
474
- Assorted fixes to multi-pack-index code paths.
475
-
476
- Will merge to 'master'.
477
- source: <cover.1718126886.git.me@ttaylorr.com>
478
-
479
-
480
-* vd/mktree (2024-06-11) 16 commits
494
+* vd/mktree (2024-06-20) 17 commits
495
- mktree: remove entries when mode is 0
496
- mktree: allow deeper paths in input
497
- mktree: optionally add to an existing tree
@@ -487,9 +501,10 @@ Release tarballs are available at:
501
- mktree: overwrite duplicate entries
502
- mktree: validate paths more carefully
503
- mktree: add a --literally option
504
+ - mktree.c: do not fail on mismatched submodule type
505
- mktree: use read_index_info to read stdin lines
506
- index-info.c: parse object type in provided in read_index_info
492
- - index-info.c: identify empty input lines in read_index_info
507
+ - index-info.c: return unrecognized lines to caller
508
- update-index: generalize 'read_index_info'
509
- mktree: use non-static tree_entry array
510
- mktree: rename treeent to tree_entry
@@ -498,11 +513,11 @@ Release tarballs are available at:
513
"git mktree" has been rewritten, taking advantage of the cache-tree
514
API.
515
501
- Waiting for comments or a reroll.
502
- source: <pull.1746.git.1718130288.gitgitgadget@gmail.com>
516
+ Needs review.
517
+ source: <pull.1746.v2.git.1718834285.gitgitgadget@gmail.com>
518
519
505
-* xx/bundie-uri-fixes (2024-06-17) 3 commits
520
+* xx/bundie-uri-fixes (2024-06-20) 3 commits
521
- unbundle: extend object verification for fetches
522
- fetch-pack: expose fsckObjects configuration logic
523
- bundle-uri: verify oid before writing refs
@@ -512,62 +527,7 @@ Release tarballs are available at:
527
objects.
528
529
Will merge to 'next'?
515
- source: <pull.1730.v7.git.1718632535.gitgitgadget@gmail.com>
516
-
517
-
518
-* rj/add-p-pager (2024-06-04) 6 commits
519
- . add-patch: introduce the command '|'
520
- . test-terminal: introduce --no-stdin-pty
521
- . pager: introduce setup_custom_pager
522
- . pager: introduce wait_for_pager
523
- . pager: do not close fd 2 unnecessarily
524
- . add-patch: test for 'p' command
525
-
526
- "git add -i" and friends learned a new '|' command that sends the
527
- current hunk to the pager, instead of dumping it to the terminal.
528
-
529
- Expecting a reroll to work well with jk/am-retry
530
- source: <1ef0ac3a-3be5-4fc2-93f8-46610f3d1880@gmail.com>
531
-
532
-
533
-* jc/heads-are-branches (2024-06-04) 3 commits
534
- (merged to 'next' on 2024-06-14 at b56b59d1d7)
535
- + show-ref: introduce --branches and deprecate --heads
536
- + ls-remote: introduce --branches and deprecate --heads
537
- + refs: call branches branches
538
-
539
- The "--heads" option of "ls-remote" and "show-ref" has been been
540
- deprecated; "--branches" replaces "--heads".
541
-
542
- Will merge to 'master'.
543
- source: <20240604220145.3260714-1-gitster@pobox.com>
544
-
545
-
546
-* rj/format-patch-auto-cover-with-interdiff (2024-06-07) 2 commits
547
- (merged to 'next' on 2024-06-13 at 3fad4afcfd)
548
- + format-patch: assume --cover-letter for diff in multi-patch series
549
- + t4014: cleanups in a few tests
550
-
551
- "git format-patch --interdiff" for multi-patch series learned to
552
- turn on cover letters automatically (unless told never to enable
553
- cover letter with "--no-cover-letter" and such).
554
-
555
- Will merge to 'master'.
556
-
557
-
558
-* rs/diff-exit-code-with-external-diff (2024-06-10) 3 commits
559
- (merged to 'next' on 2024-06-12 at 9ce495b6cc)
560
- + diff: let external diffs report that changes are uninteresting
561
- + userdiff: add and use struct external_diff
562
- + t4020: test exit code with external diffs
563
-
564
- "git diff --exit-code --ext-diff" learned to take the exit status
565
- of the external diff driver into account when deciding the exit
566
- status of the overall "git diff" invocation when configured to do
567
- so.
568
-
569
- Will merge to 'master'.
570
- source: <168fecaa-2ebd-4897-b0ba-3bd2a37c01e7@web.de>
530
+ source: <pull.1730.v8.git.1718770053.gitgitgadget@gmail.com>
531
532
533
* jc/add-i-retire-usebuiltin-config (2024-06-05) 1 commit
@@ -643,21 +603,6 @@ Release tarballs are available at:
603
source: <pull.1677.v2.git.git.1716710073910.gitgitgadget@gmail.com>
604
605
646
-* ps/document-breaking-changes (2024-06-14) 4 commits
647
- (merged to 'next' on 2024-06-14 at 8089bf6f81)
648
- + BreakingChanges: document that we do not plan to deprecate git-checkout
649
- + BreakingChanges: document removal of grafting
650
- + BreakingChanges: document upcoming change from "sha1" to "sha256"
651
- + docs: introduce document to announce breaking changes
652
-
653
- The structure of the document that records longer-term project
654
- decisions to deprecate/remove/update various behaviour has been
655
- outlined.
656
-
657
- Will merge to 'master'.
658
- source: <cover.1718345026.git.ps@pks.im>
659
-
660
-
606
* tb/pseudo-merge-reachability-bitmap (2024-06-14) 27 commits
607
(merged to 'next' on 2024-06-14 at 447d99e1c3)
608
+ pack-bitmap.c: ensure pseudo-merge offset reads are bounded
@@ -698,24 +643,6 @@ Release tarballs are available at:
643
source: <cover.1718392943.git.me@ttaylorr.com>
644
645
701
-* kn/update-ref-symref (2024-06-07) 8 commits
702
- (merged to 'next' on 2024-06-13 at 5cf8d7513e)
703
- + update-ref: add support for 'symref-update' command
704
- + reftable: pick either 'oid' or 'target' for new updates
705
- + update-ref: add support for 'symref-create' command
706
- + update-ref: add support for 'symref-delete' command
707
- + update-ref: add support for 'symref-verify' command
708
- + refs: specify error for regular refs with `old_target`
709
- + refs: create and use `ref_update_expects_existing_old_ref()`
710
- + Merge branch 'kn/ref-transaction-symref' into kn/update-ref-symref
711
-
712
- "git update-ref --stdin" learned to handle transactional updates of
713
- symbolic-refs.
714
-
715
- Will merge to 'master'.
716
- source: <20240607133304.2333280-1-knayak@gitlab.com>
717
-
718
-
646
* tb/precompose-getcwd (2024-05-31) 1 commit
647
(merged to 'next' on 2024-06-17 at 7596abec9f)
648
+ macOS: ls-files path fails if path of workdir is NFD
@@ -729,19 +656,6 @@ Release tarballs are available at:
656
source: <20240531193156.28046-1-tboegi@web.de>
657
658
732
-* pw/rebase-i-error-message (2024-05-30) 2 commits
733
- (merged to 'next' on 2024-06-13 at dbec12cfda)
734
- + rebase -i: improve error message when picking merge
735
- + rebase -i: pass struct replay_opts to parse_insn_line()
736
-
737
- When the user adds to "git rebase -i" instruction to "pick" a merge
738
- commit, the error experience is not pleasant. Such an error is now
739
- caught earlier in the process that parses the todo list.
740
-
741
- Will merge to 'master'.
742
- source: <pull.1672.v3.git.1717076630.gitgitgadget@gmail.com>
743
-
744
-
659
* ie/config-includeif-hostname (2024-03-19) 2 commits
660
- config: learn the "hostname:" includeIf condition
661
- t: add a test helper for getting hostname
@@ -829,3 +743,20 @@ Release tarballs are available at:
743
744
Not ready to be reviewed yet.
745
source: <20230824205456.1231371-1-gitster@pobox.com>
746
+
747
+--------------------------------------------------
748
+[Discarded]
749
+
750
+* rj/add-p-pager (2024-06-04) 6 commits
751
+ . add-patch: introduce the command '|'
752
+ . test-terminal: introduce --no-stdin-pty
753
+ . pager: introduce setup_custom_pager
754
+ . pager: introduce wait_for_pager
755
+ . pager: do not close fd 2 unnecessarily
756
+ . add-patch: test for 'p' command
757
+
758
+ "git add -i" and friends learned a new '|' command that sends the
759
+ current hunk to the pager, instead of dumping it to the terminal.
760
+
761
+ Expecting a reroll to work well with jk/am-retry
762
+ source: <1ef0ac3a-3be5-4fc2-93f8-46610f3d1880@gmail.com>