What's cooking (2023/11 #01)
Junio C Hamano committed
Nov 2, 2023 at 16:04 UTC
13ede096388fc09c1872e85da18398c901379d17
1 file changed
+297
-306
whats-cooking.txt
+297
-306
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2023, #09; Mon, 30)
3
-X-master-at: 2e8e77cbac8ac17f94eee2087187fa1718e38b14
4
-X-next-at: ea05f2083d1990e732cb98be6e05cafff493545b
2
+Subject: What's cooking in git.git (Nov 2023, #01; Thu, 2)
3
+X-master-at: 692be87cbba55e8488f805d236f2ad50483bd7d5
4
+X-next-at: 2469dfc402e53bfa18aaef393af11393d21a9522
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Oct 2023, #09; Mon, 30)
7
+What's cooking in git.git (Nov 2023, #01; Thu, 2)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,9 +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
-There are too many topics marked with "Needs review" label. I can
21
-help reviewing some of them myself, but obviously it will not scale.
22
-
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.
@@ -49,195 +46,234 @@ Release tarballs are available at:
46
https://www.kernel.org/pub/software/scm/git/
47
48
--------------------------------------------------
52
-[Graduated to 'master']
49
+[New Topics]
50
+
51
+* jc/strbuf-comment-line-char (2023-11-01) 4 commits
52
+ - strbuf: move env-using functions to environment.c
53
+ - strbuf: make add_lines() public
54
+ - strbuf_add_commented_lines(): drop the comment_line_char parameter
55
+ - strbuf_commented_addf(): drop the comment_line_char parameter
56
+
57
+ Code simplification.
58
+ source: <cover.1698791220.git.jonathantanmy@google.com>
59
+
60
+
61
+* ps/show-ref (2023-11-01) 12 commits
62
+ (merged to 'next' on 2023-11-02 at 987bb117f5)
63
+ + t: use git-show-ref(1) to check for ref existence
64
+ + builtin/show-ref: add new mode to check for reference existence
65
+ + builtin/show-ref: explicitly spell out different modes in synopsis
66
+ + builtin/show-ref: ensure mutual exclusiveness of subcommands
67
+ + builtin/show-ref: refactor options for patterns subcommand
68
+ + builtin/show-ref: stop using global vars for `show_one()`
69
+ + builtin/show-ref: stop using global variable to count matches
70
+ + builtin/show-ref: refactor `--exclude-existing` options
71
+ + builtin/show-ref: fix dead code when passing patterns
72
+ + builtin/show-ref: fix leaking string buffer
73
+ + builtin/show-ref: split up different subcommands
74
+ + builtin/show-ref: convert pattern to a local variable
75
+
76
+ Teach "git show-ref" a mode to check the existence of a ref.
77
+
78
+ Will merge to 'master'.
79
+ source: <cover.1698739941.git.ps@pks.im>
80
+
81
+
82
+* rc/trace-upload-pack (2023-10-30) 1 commit
83
+ (merged to 'next' on 2023-11-01 at 90892b5cf0)
84
+ + upload-pack: add tracing for fetches
85
+
86
+ Trace2 update.
87
+
88
+ Will merge to 'master'.
89
+ source: <pull.1598.v2.git.1697577168128.gitgitgadget@gmail.com>
90
+
91
54
-* bc/racy-4gb-files (2023-10-13) 2 commits
55
- (merged to 'next' on 2023-10-16 at c60962dfee)
56
- + Prevent git from rehashing 4GiB files
57
- + t: add a test helper to truncate files
58
-
59
- The index file has room only for lower 32-bit of the file size in
60
- the cached stat information, which means cached stat information
61
- will have 0 in its sd_size member for a file whose size is multiple
62
- of 4GiB. This is mistaken for a racily clean path. Avoid it by
63
- storing a bogus sd_size value instead for such files.
64
- source: <20231012160930.330618-1-sandals@crustytoothpaste.net>
65
-
66
-
67
-* en/docfixes (2023-10-09) 25 commits
68
- (merged to 'next' on 2023-10-17 at 1e3cdeb427)
69
- + documentation: add missing parenthesis
70
- + documentation: add missing quotes
71
- + documentation: add missing fullstops
72
- + documentation: add some commas where they are helpful
73
- + documentation: fix whitespace issues
74
- + documentation: fix capitalization
75
- + documentation: fix punctuation
76
- + documentation: use clearer prepositions
77
- + documentation: add missing hyphens
78
- + documentation: remove unnecessary hyphens
79
- + documentation: add missing article
80
- + documentation: fix choice of article
81
- + documentation: whitespace is already generally plural
82
- + documentation: fix singular vs. plural
83
- + documentation: fix verb vs. noun
84
- + documentation: fix adjective vs. noun
85
- + documentation: fix verb tense
86
- + documentation: employ consistent verb tense for a list
87
- + documentation: fix subject/verb agreement
88
- + documentation: remove extraneous words
89
- + documentation: add missing words
90
- + documentation: fix apostrophe usage
91
- + documentation: fix typos
92
- + documentation: fix small error
93
- + documentation: wording improvements
94
-
95
- Documentation typo and grammo fixes.
96
- source: <pull.1595.git.1696747527.gitgitgadget@gmail.com>
97
-
98
-
99
-* jc/fail-stash-to-store-non-stash (2023-10-11) 1 commit
100
- (merged to 'next' on 2023-10-16 at e26db57315)
101
- + stash: be careful what we store
102
-
103
- Feeding "git stash store" with a random commit that was not created
104
- by "git stash create" now errors out.
105
- source: <xmqqbkd4lwj0.fsf_-_@gitster.g>
106
-
107
-
108
-* jk/chunk-bounds (2023-10-14) 21 commits
109
- (merged to 'next' on 2023-10-16 at 68c9e37980)
110
- + t5319: make corrupted large-offset test more robust
111
- (merged to 'next' on 2023-10-10 at 21139603ce)
112
- + chunk-format: drop pair_chunk_unsafe()
113
- + commit-graph: detect out-of-order BIDX offsets
114
- + commit-graph: check bounds when accessing BIDX chunk
115
- + commit-graph: check bounds when accessing BDAT chunk
116
- + commit-graph: bounds-check generation overflow chunk
117
- + commit-graph: check size of generations chunk
118
- + commit-graph: bounds-check base graphs chunk
119
- + commit-graph: detect out-of-bounds extra-edges pointers
120
- + commit-graph: check size of commit data chunk
121
- + midx: check size of revindex chunk
122
- + midx: bounds-check large offset chunk
123
- + midx: check size of object offset chunk
124
- + midx: enforce chunk alignment on reading
125
- + midx: check size of pack names chunk
126
- + commit-graph: check consistency of fanout table
127
- + midx: check size of oid lookup chunk
128
- + commit-graph: check size of oid fanout chunk
129
- + midx: stop ignoring malformed oid fanout chunk
130
- + t: add library for munging chunk-format files
131
- + chunk-format: note that pair_chunk() is unsafe
132
- (this branch is used by tb/pair-chunk-expect-size.)
133
-
134
- The codepaths that read "chunk" formatted files have been corrected
135
- to pay attention to the chunk size and notice broken files.
136
- source: <20231009205544.GA3281950@coredump.intra.peff.net>
137
-
138
-
139
-* so/diff-merges-dd (2023-10-09) 3 commits
140
- (merged to 'next' on 2023-10-16 at 71b5e29625)
141
- + completion: complete '--dd'
142
- + diff-merges: introduce '--dd' option
143
- + diff-merges: improve --diff-merges documentation
144
-
145
- "git log" and friends learned "--dd" that is a short-hand for
146
- "--diff-merges=first-parent -p".
147
- source: <20231009160535.236523-1-sorganov@gmail.com>
92
+* bc/merge-file-object-input (2023-11-02) 2 commits
93
+ - merge-file: add an option to process object IDs
94
+ - git-merge-file doc: drop "-file" from argument placeholders
95
+
96
+ "git merge-file" learns a mode to read three contents to be merged
97
+ from blob objects.
98
+
99
+ Will merge to 'next'.
100
+ source: <20231101192419.794162-1-sandals@crustytoothpaste.net>
101
+
102
+
103
+* jc/test-i18ngrep (2023-10-31) 2 commits
104
+ - tests: teach callers of test_i18ngrep to use test_grep
105
+ - test framework: further deprecate test_i18ngrep
106
+
107
+ Another step to deprecate test_i18ngrep.
108
+
109
+ Will merge to 'next'.
110
+ source: <20231031052330.3762989-1-gitster@pobox.com>
111
+
112
+
113
+* an/clang-format-typofix (2023-11-01) 1 commit
114
+ (merged to 'next' on 2023-11-02 at 7f639690ab)
115
+ + clang-format: fix typo in comment
116
+
117
+ Typofix.
118
+
119
+ Will merge to 'master'.
120
+ source: <pull.1602.v2.git.git.1698759629166.gitgitgadget@gmail.com>
121
+
122
+
123
+* jk/tree-name-and-depth-limit (2023-11-02) 1 commit
124
+ - max_tree_depth: lower it for MSVC to avoid stack overflows
125
+
126
+ Further limit tree depth max to avoid Windows build running out of
127
+ the stack space.
128
+
129
+ Will merge to 'next' and then to 'master'.
130
+ source: <pull.1604.v2.git.1698843810814.gitgitgadget@gmail.com>
131
132
--------------------------------------------------
150
-[New Topics]
133
+[Graduated to 'master']
134
+
135
+* da/t7601-style-fix (2023-10-18) 1 commit
136
+ (merged to 'next' on 2023-10-20 at 8e7326458c)
137
+ + t7601: use "test_path_is_file" etc. instead of "test -f"
138
+
139
+ Coding style update.
140
+ source: <20231018124538.68549-2-anonolitunya@gmail.com>
141
+
142
143
* ii/branch-error-messages-update (2023-10-23) 1 commit
144
(merged to 'next' on 2023-10-23 at 3d00599173)
145
+ builtin/branch.c: adjust error messages to coding guidelines
146
147
Error message update.
157
-
158
- Will merge to 'master'.
148
source: <20231023160656.4341-1-isokenjune@gmail.com>
149
150
162
-* jm/bisect-run-synopsis-fix (2023-10-23) 1 commit
163
- (merged to 'next' on 2023-10-23 at 8dfa3ed356)
164
- + doc/git-bisect: clarify `git bisect run` syntax
151
+* jc/am-doc-whitespace-action-fix (2023-10-18) 1 commit
152
+ (merged to 'next' on 2023-10-20 at 9200d39c08)
153
+ + am: align placeholder for --whitespace option with apply
154
166
- Doc and usage message update.
155
+ Docfix.
156
+ source: <xmqqwmvjzeqd.fsf@gitster.g>
157
168
- Will merge to 'master'.
169
- source: <pull.1602.v2.git.1698088990478.gitgitgadget@gmail.com>
158
159
+* jc/attr-tree-config (2023-10-13) 2 commits
160
+ (merged to 'next' on 2023-10-19 at 202dc1c453)
161
+ + attr: add attr.tree for setting the treeish to read attributes from
162
+ + attr: read attributes from HEAD when bare repo
163
+
164
+ The attribute subsystem learned to honor `attr.tree` configuration
165
+ that specifies which tree to read the .gitattributes files from.
166
+ source: <pull.1577.v5.git.git.1697218770.gitgitgadget@gmail.com>
167
+
168
+
169
+* jc/commit-new-underscore-index-fix (2023-10-17) 1 commit
170
+ (merged to 'next' on 2023-10-22 at 0e4787303d)
171
+ + commit: do not use cryptic "new_index" in end-user facing messages
172
+
173
+ Message fix.
174
+ source: <xmqqo7gwvd8c.fsf_-_@gitster.g>
175
172
-* ar/submitting-patches-doc-update (2023-10-24) 1 commit
173
- - SubmittingPatches: call gitk's command "Copy commit reference"
176
+
177
+* jc/update-list-references-to-lore (2023-10-06) 1 commit
178
+ (merged to 'next' on 2023-10-19 at 83a721a137)
179
+ + doc: update list archive reference to use lore.kernel.org
180
181
Doc update.
182
+ source: <xmqq7cnz741s.fsf@gitster.g>
183
177
- Will merge to 'next'.
178
- source: <20231024195123.911431-1-rybak.a.v@gmail.com>
184
185
+* jk/send-email-fix-addresses-from-composed-messages (2023-10-20) 3 commits
186
+ (merged to 'next' on 2023-10-22 at 43221cc3a4)
187
+ + send-email: handle to/cc/bcc from --compose message
188
+ + Revert "send-email: extract email-parsing code into a subroutine"
189
+ + doc/send-email: mention handling of "reply-to" with --compose
190
+
191
+ The codepath to handle recipient addresses `git send-email
192
+ --compose` learns from the user was completely broken, which has
193
+ been corrected.
194
+ source: <20231020100343.GA2194322@coredump.intra.peff.net>
195
181
-* es/bugreport-no-extra-arg (2023-10-29) 2 commits
182
- - bugreport: reject positional arguments
183
- - t0091-bugreport: stop using i18ngrep
196
185
- source: <20231026155459.2234929-1-nasamuffin@google.com>
197
+* jm/bisect-run-synopsis-fix (2023-10-23) 1 commit
198
+ (merged to 'next' on 2023-10-23 at 8dfa3ed356)
199
+ + doc/git-bisect: clarify `git bisect run` syntax
200
201
+ Doc and usage message update.
202
+ source: <pull.1602.v2.git.1698088990478.gitgitgadget@gmail.com>
203
188
-* js/my-first-contribution-update (2023-10-28) 1 commit
189
- - Include gettext.h in MyFirstContribution tutorial
204
191
- source: <20231017041503.3249-1-jacob@initialcommit.io>
205
+* kh/pathspec-error-wo-repository-fix (2023-10-20) 1 commit
206
+ (merged to 'next' on 2023-10-22 at 4f77af1e40)
207
+ + grep: die gracefully when outside repository
208
209
+ The pathspec code carelessly dereferenced NULL while emitting an
210
+ error message, which has been corrected.
211
+ source: <5c8ef6bec1c99e0fae7ada903885a8e77f8137f9.1697819838.git.code@khaugsbakk.name>
212
194
-* ms/send-email-validate-fix (2023-10-26) 1 commit
195
- - send-email: move validation code below process_address_list
213
197
- source: <ddd4bfdd-ed14-44f4-89d3-192332bbc1c4@amd.com>
214
+* mm/p4-symlink-with-lfs (2023-10-19) 1 commit
215
+ (merged to 'next' on 2023-10-20 at 9c05ce7e85)
216
+ + git-p4 shouldn't attempt to store symlinks in LFS
217
218
+ "git p4" tried to store symlinks to LFS when told, but has been
219
+ fixed not to do so, because it does not make sense.
220
+ source: <20231019002558.867830-1-mmcclain@noprivs.com>
221
200
-* ps/ci-gitlab (2023-10-29) 5 commits
201
- - ci: add support for GitLab CI
202
- - ci: split out logic to set up failed test artifacts
203
- - ci: group installation of Docker dependencies
204
- - ci: make grouping setup more generic
205
- - ci: reorder definitions for grouping functions
222
207
- source: <cover.1698398590.git.ps@pks.im>
223
+* ms/doc-push-fix (2023-10-20) 1 commit
224
+ (merged to 'next' on 2023-10-22 at 7ce3cef56b)
225
+ + git-push doc: more visibility for -q option
226
227
+ Docfix.
228
+ source: <20231020184627.14336-1-msuchanek@suse.de>
229
210
-* ps/ref-tests-update (2023-10-24) 9 commits
211
- - t: mark several tests that assume the files backend with REFFILES
212
- - t7900: assert the absence of refs via git-for-each-ref(1)
213
- - t7300: assert exact states of repo
214
- - t4207: delete replace references via git-update-ref(1)
215
- - t1450: convert tests to remove worktrees via git-worktree(1)
216
- - t: convert tests to not access reflog via the filesystem
217
- - t: convert tests to not access symrefs via the filesystem
218
- - t: convert tests to not write references via the filesystem
219
- - t: allow skipping expected object ID in `ref-store update-ref`
230
221
- source: <cover.1698156169.git.ps@pks.im>
231
+* ni/die-message-fix-for-git-add (2023-10-17) 1 commit
232
+ (merged to 'next' on 2023-10-22 at f46c5dfd63)
233
+ + builtin/add.c: clean up die() messages
234
235
+ Message updates.
236
+ source: <20231017113946.747-1-naomi.ibeh69@gmail.com>
237
224
-* rs/fix-arghelp (2023-10-29) 1 commit
225
- - am, rebase: fix arghelp syntax of --empty
238
227
- source: <10e09b2d-15d7-4af1-b24c-217f9e2f457a@web.de>
239
+* ob/rebase-cleanup (2023-10-20) 3 commits
240
+ (merged to 'next' on 2023-10-22 at 05e14ca4fc)
241
+ + rebase: move parse_opt_keep_empty() down
242
+ + rebase: handle --strategy via imply_merge() as well
243
+ + rebase: simplify code related to imply_merge()
244
245
+ Code clean-up.
246
+ source: <20231020093654.922890-1-oswald.buddenhagen@gmx.de>
247
230
-* rs/parse-options-cmdmode (2023-10-29) 2 commits
231
- - am: simplify --show-current-patch handling
232
- - parse-options: make CMDMODE errors more precise
248
234
- source: <4520156b-9418-493c-a50c-e61b42e805b3@web.de>
249
+* ps/git-repack-doc-fixes (2023-10-16) 2 commits
250
+ (merged to 'next' on 2023-10-22 at df64849f26)
251
+ + doc/git-repack: don't mention nonexistent "--unpacked" option
252
+ + doc/git-repack: fix syntax for `-g` shorthand option
253
254
+ Doc updates.
255
+ source: <cover.1697440686.git.ps@pks.im>
256
237
-* rs/reflog-expire-single-worktree-fix (2023-10-29) 1 commit
238
- - reflog: fix expire --single-worktree
257
240
- source: <63eade0e-bf2c-4906-8b4c-689797cff737@web.de>
258
+* sn/typo-grammo-phraso-fixes (2023-10-05) 5 commits
259
+ (merged to 'next' on 2023-10-18 at 575d767f9a)
260
+ + t/README: fix multi-prerequisite example
261
+ + doc/gitk: s/sticked/stuck/
262
+ + git-jump: admit to passing merge mode args to ls-files
263
+ + doc/diff-options: improve wording of the log.diffMerges mention
264
+ + doc: fix some typos, grammar and wording issues
265
+
266
+ Many typos, ungrammatical sentences and wrong phrasing have been
267
+ fixed.
268
+ source: <20231003082107.3002173-1-stepnem@smrk.net>
269
+
270
+
271
+* wx/merge-ort-comment-typofix (2023-10-21) 1 commit
272
+ (merged to 'next' on 2023-10-22 at ad1e33883a)
273
+ + merge-ort.c: fix typo 'neeed' to 'needed'
274
+
275
+ Typofix.
276
+ source: <pull.1592.v3.git.git.1697942768555.gitgitgadget@gmail.com>
277
278
--------------------------------------------------
279
[Stalled]
@@ -284,102 +320,124 @@ Release tarballs are available at:
320
--------------------------------------------------
321
[Cooking]
322
287
-* jc/am-doc-whitespace-action-fix (2023-10-18) 1 commit
288
- (merged to 'next' on 2023-10-20 at 9200d39c08)
289
- + am: align placeholder for --whitespace option with apply
323
+* ar/submitting-patches-doc-update (2023-10-24) 1 commit
324
+ (merged to 'next' on 2023-10-30 at e140009eb6)
325
+ + SubmittingPatches: call gitk's command "Copy commit reference"
326
291
- Docfix.
327
+ Doc update.
328
329
Will merge to 'master'.
294
- source: <xmqqwmvjzeqd.fsf@gitster.g>
330
+ source: <20231024195123.911431-1-rybak.a.v@gmail.com>
331
332
297
-* da/t7601-style-fix (2023-10-18) 1 commit
298
- (merged to 'next' on 2023-10-20 at 8e7326458c)
299
- + t7601: use "test_path_is_file" etc. instead of "test -f"
333
+* es/bugreport-no-extra-arg (2023-10-29) 2 commits
334
+ (merged to 'next' on 2023-11-01 at 4ca0a9c77c)
335
+ + bugreport: reject positional arguments
336
+ + t0091-bugreport: stop using i18ngrep
337
301
- Coding style update.
338
+ "git bugreport" learned to complain when it received a command line
339
+ argument that it will not use.
340
341
Will merge to 'master'.
304
- source: <20231018124538.68549-2-anonolitunya@gmail.com>
342
+ source: <20231026155459.2234929-1-nasamuffin@google.com>
343
344
307
-* jx/fetch-atomic-error-message-fix (2023-10-19) 2 commits
308
- - fetch: no redundant error message for atomic fetch
309
- - t5574: test porcelain output of atomic fetch
345
+* js/my-first-contribution-update (2023-10-28) 1 commit
346
+ (merged to 'next' on 2023-11-01 at 94590ee724)
347
+ + Include gettext.h in MyFirstContribution tutorial
348
311
- "git fetch --atomic" issued an unnecessary empty error message,
312
- which has been corrected.
349
+ Documentation update.
350
314
- Needs review.
315
- source: <ced46baeb1c18b416b4b4cc947f498bea2910b1b.1697725898.git.zhiyou.jx@alibaba-inc.com>
351
+ Will merge to 'master'.
352
+ source: <20231017041503.3249-1-jacob@initialcommit.io>
353
354
318
-* mm/p4-symlink-with-lfs (2023-10-19) 1 commit
319
- (merged to 'next' on 2023-10-20 at 9c05ce7e85)
320
- + git-p4 shouldn't attempt to store symlinks in LFS
355
+* ms/send-email-validate-fix (2023-10-26) 1 commit
356
+ (merged to 'next' on 2023-11-01 at f9dd32186b)
357
+ + send-email: move validation code below process_address_list
358
322
- "git p4" tried to store symlinks to LFS when told, but has been
323
- fixed not to do so, because it does not make sense.
359
+ "git send-email" did not have certain pieces of data computed yet
360
+ when it tried to validate the outging messages and its recipient
361
+ addresses, which has been sorted out.
362
363
Will merge to 'master'.
326
- source: <20231019002558.867830-1-mmcclain@noprivs.com>
364
+ source: <ddd4bfdd-ed14-44f4-89d3-192332bbc1c4@amd.com>
365
366
329
-* jk/send-email-fix-addresses-from-composed-messages (2023-10-20) 3 commits
330
- (merged to 'next' on 2023-10-22 at 43221cc3a4)
331
- + send-email: handle to/cc/bcc from --compose message
332
- + Revert "send-email: extract email-parsing code into a subroutine"
333
- + doc/send-email: mention handling of "reply-to" with --compose
367
+* ps/ci-gitlab (2023-11-02) 8 commits
368
+ - ci: add support for GitLab CI
369
+ - ci: install test dependencies for linux-musl
370
+ - ci: squelch warnings when testing with unusable Git repo
371
+ - ci: unify setup of some environment variables
372
+ - ci: split out logic to set up failed test artifacts
373
+ - ci: group installation of Docker dependencies
374
+ - ci: make grouping setup more generic
375
+ - ci: reorder definitions for grouping functions
376
335
- The codepath to handle recipient addresses `git send-email
336
- --compose` learns from the user was completely broken, which has
337
- been corrected.
377
+ Add support for GitLab CI.
378
339
- Will merge to 'master'.
340
- source: <20231020100343.GA2194322@coredump.intra.peff.net>
379
+ Comments?
380
+ source: <cover.1698843660.git.ps@pks.im>
381
382
343
-* ms/doc-push-fix (2023-10-20) 1 commit
344
- (merged to 'next' on 2023-10-22 at 7ce3cef56b)
345
- + git-push doc: more visibility for -q option
383
+* ps/ref-tests-update (2023-10-24) 9 commits
384
+ - t: mark several tests that assume the files backend with REFFILES
385
+ - t7900: assert the absence of refs via git-for-each-ref(1)
386
+ - t7300: assert exact states of repo
387
+ - t4207: delete replace references via git-update-ref(1)
388
+ - t1450: convert tests to remove worktrees via git-worktree(1)
389
+ - t: convert tests to not access reflog via the filesystem
390
+ - t: convert tests to not access symrefs via the filesystem
391
+ - t: convert tests to not write references via the filesystem
392
+ - t: allow skipping expected object ID in `ref-store update-ref`
393
347
- Docfix.
394
+ Update ref-related tests.
395
349
- Will merge to 'master'.
350
- source: <20231020184627.14336-1-msuchanek@suse.de>
396
+ Will merge to 'next'?
397
+ source: <cover.1698156169.git.ps@pks.im>
398
399
353
-* ob/rebase-cleanup (2023-10-20) 3 commits
354
- (merged to 'next' on 2023-10-22 at 05e14ca4fc)
355
- + rebase: move parse_opt_keep_empty() down
356
- + rebase: handle --strategy via imply_merge() as well
357
- + rebase: simplify code related to imply_merge()
400
+* rs/fix-arghelp (2023-10-29) 1 commit
401
+ (merged to 'next' on 2023-11-01 at cd923d3362)
402
+ + am, rebase: fix arghelp syntax of --empty
403
359
- Code clean-up.
404
+ Doc and help update.
405
406
Will merge to 'master'.
362
- source: <20231020093654.922890-1-oswald.buddenhagen@gmx.de>
407
+ source: <10e09b2d-15d7-4af1-b24c-217f9e2f457a@web.de>
408
409
365
-* wx/merge-ort-comment-typofix (2023-10-21) 1 commit
366
- (merged to 'next' on 2023-10-22 at ad1e33883a)
367
- + merge-ort.c: fix typo 'neeed' to 'needed'
410
+* rs/parse-options-cmdmode (2023-10-29) 2 commits
411
+ (merged to 'next' on 2023-11-01 at b83328f1e7)
412
+ + am: simplify --show-current-patch handling
413
+ + parse-options: make CMDMODE errors more precise
414
369
- Typofix.
415
+ parse-options improvements for OPT_CMDMODE options.
416
417
Will merge to 'master'.
372
- source: <pull.1592.v3.git.git.1697942768555.gitgitgadget@gmail.com>
418
+ source: <4520156b-9418-493c-a50c-e61b42e805b3@web.de>
419
420
375
-* jc/commit-new-underscore-index-fix (2023-10-17) 1 commit
376
- (merged to 'next' on 2023-10-22 at 0e4787303d)
377
- + commit: do not use cryptic "new_index" in end-user facing messages
421
+* rs/reflog-expire-single-worktree-fix (2023-10-29) 1 commit
422
+ (merged to 'next' on 2023-11-01 at 6b4dab2cd2)
423
+ + reflog: fix expire --single-worktree
424
379
- Message fix.
425
+ "git reflog expire --single-worktree" has been broken for the past
426
+ 20 months or so, which has been corrected.
427
428
Will merge to 'master'.
382
- source: <xmqqo7gwvd8c.fsf_-_@gitster.g>
429
+ source: <63eade0e-bf2c-4906-8b4c-689797cff737@web.de>
430
+
431
+
432
+* jx/fetch-atomic-error-message-fix (2023-10-19) 2 commits
433
+ - fetch: no redundant error message for atomic fetch
434
+ - t5574: test porcelain output of atomic fetch
435
+
436
+ "git fetch --atomic" issued an unnecessary empty error message,
437
+ which has been corrected.
438
+
439
+ Needs review.
440
+ source: <ced46baeb1c18b416b4b4cc947f498bea2910b1b.1697725898.git.zhiyou.jx@alibaba-inc.com>
441
442
443
* js/bugreport-in-the-same-minute (2023-10-16) 1 commit
@@ -394,17 +452,6 @@ Release tarballs are available at:
452
source: <20231016214045.146862-2-jacob@initialcommit.io>
453
454
397
-* kh/pathspec-error-wo-repository-fix (2023-10-20) 1 commit
398
- (merged to 'next' on 2023-10-22 at 4f77af1e40)
399
- + grep: die gracefully when outside repository
400
-
401
- The pathspec code carelessly dereferenced NULL while emitting an
402
- error message, which has been corrected.
403
-
404
- Will merge to 'master'.
405
- source: <5c8ef6bec1c99e0fae7ada903885a8e77f8137f9.1697819838.git.code@khaugsbakk.name>
406
-
407
-
455
* kh/t7900-cleanup (2023-10-17) 9 commits
456
- t7900: fix register dependency
457
- t7900: factor out packfile dependency
@@ -418,31 +465,11 @@ Release tarballs are available at:
465
466
Test clean-up.
467
421
- Needs review.
468
+ Perhaps discard?
469
+ cf. <655ca147-c214-41be-919d-023c1b27b311@app.fastmail.com>
470
source: <cover.1697319294.git.code@khaugsbakk.name>
471
472
425
-* ni/die-message-fix-for-git-add (2023-10-17) 1 commit
426
- (merged to 'next' on 2023-10-22 at f46c5dfd63)
427
- + builtin/add.c: clean up die() messages
428
-
429
- Message updates.
430
-
431
- Will merge to 'master'.
432
- source: <20231017113946.747-1-naomi.ibeh69@gmail.com>
433
-
434
-
435
-* ps/git-repack-doc-fixes (2023-10-16) 2 commits
436
- (merged to 'next' on 2023-10-22 at df64849f26)
437
- + doc/git-repack: don't mention nonexistent "--unpacked" option
438
- + doc/git-repack: fix syntax for `-g` shorthand option
439
-
440
- Doc updates.
441
-
442
- Will merge to 'master'.
443
- source: <cover.1697440686.git.ps@pks.im>
444
-
445
-
473
* tb/merge-tree-write-pack (2023-10-23) 5 commits
474
- builtin/merge-tree.c: implement support for `--write-pack`
475
- bulk-checkin: introduce `index_tree_bulk_checkin_incore()`
@@ -457,20 +484,21 @@ Release tarballs are available at:
484
source: <cover.1698101088.git.me@ttaylorr.com>
485
486
460
-* tb/format-pack-doc-update (2023-10-12) 2 commits
461
- - Documentation/gitformat-pack.txt: fix incorrect MIDX documentation
462
- - Documentation/gitformat-pack.txt: fix typo
487
+* tb/format-pack-doc-update (2023-11-01) 2 commits
488
+ (merged to 'next' on 2023-11-02 at 538991fe9b)
489
+ + Documentation/gitformat-pack.txt: fix incorrect MIDX documentation
490
+ + Documentation/gitformat-pack.txt: fix typo
491
492
Doc update.
493
466
- Expecting a reroll.
467
- cf. <xmqq5y3b4id2.fsf@gitster.g>
468
- source: <cover.1697144959.git.me@ttaylorr.com>
494
+ Will merge to 'master'.
495
+ source: <cover.1698780244.git.me@ttaylorr.com>
496
497
471
-* ps/do-not-trust-commit-graph-blindly-for-existence (2023-10-24) 2 commits
472
- - commit: detect commits that exist in commit-graph but not in the ODB
473
- - commit-graph: introduce envvar to disable commit existence checks
498
+* ps/do-not-trust-commit-graph-blindly-for-existence (2023-11-01) 2 commits
499
+ (merged to 'next' on 2023-11-01 at 06037376ee)
500
+ + commit: detect commits that exist in commit-graph but not in the ODB
501
+ + commit-graph: introduce envvar to disable commit existence checks
502
(this branch is used by kn/rev-list-missing-fix.)
503
504
The codepath to traverse the commit-graph learned to notice that a
@@ -478,8 +506,8 @@ Release tarballs are available at:
506
though it knows something about the commit (like its parents) from
507
what is in commit-graph.
508
481
- Comments?
482
- source: <cover.1698060036.git.ps@pks.im>
509
+ Will merge to 'master'.
510
+ source: <cover.1698736363.git.ps@pks.im>
511
512
513
* tb/pair-chunk-expect-size (2023-10-14) 8 commits
@@ -500,13 +528,15 @@ Release tarballs are available at:
528
529
530
* jc/grep-f-relative-to-cwd (2023-10-12) 1 commit
503
- - grep: -f <path> is relative to $cwd
531
+ (merged to 'next' on 2023-10-31 at 0d32547b18)
532
+ + grep: -f <path> is relative to $cwd
533
534
"cd sub && git grep -f patterns" tried to read "patterns" file at
535
the top level of the working tree; it has been corrected to read
536
"sub/patterns" instead.
537
509
- Needs review.
538
+ Will merge to 'master'.
539
+ cf. <ZUAnEVk65VQQE263@nand.local>
540
source: <xmqqedhzg37z.fsf@gitster.g>
541
542
@@ -537,43 +567,19 @@ Release tarballs are available at:
567
source: <cover.1697653929.git.me@ttaylorr.com>
568
569
540
-* kn/rev-list-missing-fix (2023-10-29) 4 commits
541
- - rev-list: add commit object support in `--missing` option
542
- - rev-list: move `show_commit()` to the bottom
543
- - revision: rename bit to `do_not_die_on_missing_objects`
544
- - Merge branch 'ps/do-not-trust-commit-graph-blindly-for-existence' into kn/rev-list-missing-fix
570
+* kn/rev-list-missing-fix (2023-11-01) 4 commits
571
+ (merged to 'next' on 2023-11-02 at 2469dfc402)
572
+ + rev-list: add commit object support in `--missing` option
573
+ + rev-list: move `show_commit()` to the bottom
574
+ + revision: rename bit to `do_not_die_on_missing_objects`
575
+ + Merge branch 'ps/do-not-trust-commit-graph-blindly-for-existence' into kn/rev-list-missing-fix
576
(this branch uses ps/do-not-trust-commit-graph-blindly-for-existence.)
577
578
"git rev-list --missing" did not work for missing commit objects,
579
which has been corrected.
580
550
- Will merge to 'next'.
551
- source: <20231026101109.43110-1-karthik.188@gmail.com>
552
-
553
-
554
-* sn/typo-grammo-phraso-fixes (2023-10-05) 5 commits
555
- (merged to 'next' on 2023-10-18 at 575d767f9a)
556
- + t/README: fix multi-prerequisite example
557
- + doc/gitk: s/sticked/stuck/
558
- + git-jump: admit to passing merge mode args to ls-files
559
- + doc/diff-options: improve wording of the log.diffMerges mention
560
- + doc: fix some typos, grammar and wording issues
561
-
562
- Many typos, ungrammatical sentences and wrong phrasing have been
563
- fixed.
564
-
565
- Will merge to 'master'.
566
- source: <20231003082107.3002173-1-stepnem@smrk.net>
567
-
568
-
569
-* jc/update-list-references-to-lore (2023-10-06) 1 commit
570
- (merged to 'next' on 2023-10-19 at 83a721a137)
571
- + doc: update list archive reference to use lore.kernel.org
572
-
573
- Doc update.
574
-
581
Will merge to 'master'.
576
- source: <xmqq7cnz741s.fsf@gitster.g>
582
+ source: <20231026101109.43110-1-karthik.188@gmail.com>
583
584
585
* cc/git-replay (2023-10-10) 14 commits
@@ -615,18 +621,6 @@ Release tarballs are available at:
621
source: <20231023221143.72489-1-andy.koppe@gmail.com>
622
623
618
-* jc/attr-tree-config (2023-10-13) 2 commits
619
- (merged to 'next' on 2023-10-19 at 202dc1c453)
620
- + attr: add attr.tree for setting the treeish to read attributes from
621
- + attr: read attributes from HEAD when bare repo
622
-
623
- The attribute subsystem learned to honor `attr.tree` configuration
624
- that specifies which tree to read the .gitattributes files from.
625
-
626
- Will merge to 'master'.
627
- source: <pull.1577.v5.git.git.1697218770.gitgitgadget@gmail.com>
628
-
629
-
624
* js/update-urls-in-doc-and-comment (2023-09-26) 4 commits
625
- doc: refer to internet archive
626
- doc: update links for andre-simon.de
@@ -738,9 +732,7 @@ Release tarballs are available at:
732
source: <xmqqcyykig1l.fsf@gitster.g>
733
734
741
-* js/doc-unit-tests (2023-10-16) 5 commits
742
- - fixup! ci: run unit tests in CI
743
- - fixup! unit tests: add TAP unit test framework
735
+* js/doc-unit-tests (2023-11-02) 3 commits
736
- ci: run unit tests in CI
737
- unit tests: add TAP unit test framework
738
- unit tests: add a project plan document
@@ -748,12 +740,11 @@ Release tarballs are available at:
740
741
Process to add some form of low-level unit tests has started.
742
751
- Expecting a (hopefully final and minor) reroll.
752
- cf. <20231016134421.21659-1-phillip.wood123@gmail.com>
753
- source: <cover.1696889529.git.steadmon@google.com>
743
+ Will merge to 'next'?
744
+ source: <cover.1698881249.git.steadmon@google.com>
745
746
756
-* js/doc-unit-tests-with-cmake (2023-10-19) 7 commits
747
+* js/doc-unit-tests-with-cmake (2023-11-02) 7 commits
748
- cmake: handle also unit tests
749
- cmake: use test names instead of full paths
750
- cmake: fix typo in variable name
@@ -765,7 +756,7 @@ Release tarballs are available at:
756
757
Update the base topic to work with CMake builds.
758
768
- Needs review.
759
+ Will merge to 'next'?
760
source: <pull.1579.v3.git.1695640836.gitgitgadget@gmail.com>
761
762