What's cooking (2023/04 #03)
Junio C Hamano committed
Apr 11, 2023 at 14:19 UTC
52ae5198bdb803c79b55bd8c02f6ecd74a38e33b
1 file changed
+186
-313
whats-cooking.txt
+186
-313
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2023, #02; Thu, 6)
3
-X-master-at: 0607f793cbe0af16aee6d2480056d891835884bd
4
-X-next-at: 4ca3ef321147b456561d0c3a4c90cbb38891a488
2
+Subject: What's cooking in git.git (Apr 2023, #03; Tue, 11)
3
+X-master-at: 9857273be005833c71e2d16ba48e193113e12276
4
+X-next-at: 15816b0a8ae864e36a03af255e1d048f21d56b4d
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Apr 2023, #02; Thu, 6)
7
+What's cooking in git.git (Apr 2023, #03; Tue, 11)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -16,11 +16,6 @@ message that raises issues but they are no means exhaustive. A
16
topic without enough support may be discarded after a long period of
17
no activity.
18
19
-We are in the middle of the 4th week of an 10-week cycle which is
20
-expected to last til the end of May. With quite a many topics that
21
-have been cooking in 'next' already graduated to 'master', it is a
22
-good time to rewind the tip of 'next', which I'll be doing shortly.
23
-
19
Copies of the source code to Git live in many repositories, and the
20
following is a list of the ones I push into or their mirrors. Some
21
repositories have only a subset of branches.
@@ -52,284 +47,167 @@ Release tarballs are available at:
47
--------------------------------------------------
48
[Graduated to 'master']
49
55
-* ab/config-multi-and-nonbool (2023-03-28) 9 commits
56
- (merged to 'next' on 2023-03-30 at bcfe99b43d)
57
- + for-each-repo: with bad config, don't conflate <path> and <cmd>
58
- + config API: add "string" version of *_value_multi(), fix segfaults
59
- + config API users: test for *_get_value_multi() segfaults
60
- + for-each-repo: error on bad --config
61
- + config API: have *_multi() return an "int" and take a "dest"
62
- + versioncmp.c: refactor config reading next commit
63
- + config API: add and use a "git_config_get()" family of functions
64
- + config tests: add "NULL" tests for *_get_value_multi()
65
- + config tests: cover blind spots in git_die_config() tests
66
-
67
- Assorted config API updates.
68
- source: <cover-v8-0.9-00000000000-20230328T140126Z-avarab@gmail.com>
69
-
70
-
71
-* ab/remove-implicit-use-of-the-repository (2023-03-28) 17 commits
72
- (merged to 'next' on 2023-03-30 at e0abe2d872)
73
- + libs: use "struct repository *" argument, not "the_repository"
74
- + post-cocci: adjust comments for recent repo_* migration
75
- + cocci: apply the "revision.h" part of "the_repository.pending"
76
- + cocci: apply the "rerere.h" part of "the_repository.pending"
77
- + cocci: apply the "refs.h" part of "the_repository.pending"
78
- + cocci: apply the "promisor-remote.h" part of "the_repository.pending"
79
- + cocci: apply the "packfile.h" part of "the_repository.pending"
80
- + cocci: apply the "pretty.h" part of "the_repository.pending"
81
- + cocci: apply the "object-store.h" part of "the_repository.pending"
82
- + cocci: apply the "diff.h" part of "the_repository.pending"
83
- + cocci: apply the "commit.h" part of "the_repository.pending"
84
- + cocci: apply the "commit-reach.h" part of "the_repository.pending"
85
- + cocci: apply the "cache.h" part of "the_repository.pending"
86
- + cocci: add missing "the_repository" macros to "pending"
87
- + cocci: sort "the_repository" rules by header
88
- + cocci: fix incorrect & verbose "the_repository" rules
89
- + cocci: remove dead rule from "the_repository.pending.cocci"
90
- (this branch is used by en/header-split-cache-h.)
91
-
92
- Code clean-up around the use of the_repository.
93
- source: <cover-v2-00.17-00000000000-20230328T110946Z-avarab@gmail.com>
94
-
95
-
96
-* ds/ahead-behind (2023-03-20) 9 commits
97
- (merged to 'next' on 2023-03-23 at a607895174)
98
- + commit-reach: add tips_reachable_from_bases()
99
- + for-each-ref: add ahead-behind format atom
100
- + commit-reach: implement ahead_behind() logic
101
- + commit-graph: introduce `ensure_generations_valid()`
102
- + commit-graph: return generation from memory
103
- + commit-graph: simplify compute_generation_numbers()
104
- + commit-graph: refactor compute_topological_levels()
105
- + for-each-ref: explicitly test no matches
106
- + for-each-ref: add --stdin option
107
- (this branch is used by ps/ahead-behind-truncation-fix.)
108
-
109
- "git for-each-ref" learns '%(ahead-behind:<base>)' that computes the
110
- distances from a single reference point in the history with bunch
111
- of commits in bulk.
112
- source: <pull.1489.v4.git.1679311615.gitgitgadget@gmail.com>
113
-
114
-
115
-* ds/fetch-bundle-uri-with-all (2023-03-31) 1 commit
116
- (merged to 'next' on 2023-03-31 at a9f787341d)
117
- + fetch: download bundles once, even with --all
118
-
119
- "git fetch --all" does not have to download and handle the same
120
- bundleURI over and over, which has been corrected.
121
- source: <pull.1508.git.1680278344173.gitgitgadget@gmail.com>
122
-
123
-
124
-* en/header-split-cleanup (2023-03-21) 16 commits
125
- (merged to 'next' on 2023-03-30 at b69ff46cad)
126
- + csum-file.h: remove unnecessary inclusion of cache.h
127
- + write-or-die.h: move declarations for write-or-die.c functions from cache.h
128
- + treewide: remove cache.h inclusion due to setup.h changes
129
- + setup.h: move declarations for setup.c functions from cache.h
130
- + treewide: remove cache.h inclusion due to environment.h changes
131
- + environment.h: move declarations for environment.c functions from cache.h
132
- + treewide: remove unnecessary includes of cache.h
133
- + wrapper.h: move declarations for wrapper.c functions from cache.h
134
- + path.h: move function declarations for path.c functions from cache.h
135
- + cache.h: remove expand_user_path()
136
- + abspath.h: move absolute path functions from cache.h
137
- + environment: move comment_line_char from cache.h
138
- + treewide: remove unnecessary cache.h inclusion from several sources
139
- + treewide: remove unnecessary inclusion of gettext.h
140
- + treewide: be explicit about dependence on gettext.h
141
- + treewide: remove unnecessary cache.h inclusion from a few headers
142
- (this branch is used by en/header-split-cache-h.)
143
-
144
- Split key function and data structure definitions out of cache.h to
145
- new header files and adjust the users.
146
- source: <pull.1493.v2.git.1679379968.gitgitgadget@gmail.com>
147
-
148
-
149
-* gc/config-parsing-cleanup (2023-03-28) 8 commits
150
- (merged to 'next' on 2023-03-30 at e7ea626edf)
151
- + config.c: rename "struct config_source cf"
152
- + config: report cached filenames in die_bad_number()
153
- + config.c: remove current_parsing_scope
154
- + config.c: remove current_config_kvi
155
- + config.c: plumb the_reader through callbacks
156
- + config.c: create config_reader and the_reader
157
- + config.c: don't assign to "cf_global" directly
158
- + config.c: plumb config_source through static fns
159
-
160
- Config API clean-up to reduce its dependence on static variables
161
- source: <pull.1463.v3.git.git.1680025914.gitgitgadget@gmail.com>
162
-
163
-
164
-* jk/chainlint-fixes (2023-03-30) 5 commits
165
- (merged to 'next' on 2023-03-30 at 52f229b710)
166
- + tests: skip test_eval_ in internal chain-lint
167
- + tests: drop here-doc check from internal chain-linter
168
- + tests: diagnose unclosed here-doc in chainlint.pl
169
- + tests: replace chainlint subshell with a function
170
- + tests: run internal chain-linter under "make test"
171
-
172
- Test framework fix.
173
- source: <20230330192712.GA27719@coredump.intra.peff.net>
174
-
175
-
176
-* jk/document-pack-redundant-deprecation (2023-03-30) 1 commit
177
- (merged to 'next' on 2023-03-30 at e9d10e27a4)
178
- + pack-redundant: document deprecation
179
-
180
- Document that we have marked "pack-redundant" as deprecated.
181
- source: <20230328190641.GF18558@coredump.intra.peff.net>
182
-
183
-
184
-* jk/unused-post-2.40 (2023-03-17) 4 commits
185
- (merged to 'next' on 2023-03-30 at 10aeb0d4ae)
186
- + transport: mark unused parameters in fetch_refs_from_bundle()
187
- + http: mark unused parameter in fill_active_slot() callbacks
188
- + http: drop unused parameter from start_object_request()
189
- + mailmap: drop debugging code
190
-
191
- More "-Wunused-parameters" code clean-up.
192
- source: <ZBS77VYL9ZrxKtCN@coredump.intra.peff.net>
193
-
194
-
195
-* jk/unused-post-2.40-part2 (2023-03-28) 7 commits
196
- (merged to 'next' on 2023-03-29 at 7aeee1b6c6)
197
- + parse-options: drop parse_opt_unknown_cb()
198
- + t/helper: mark unused argv/argc arguments
199
- + mark "argv" as unused when we check argc
200
- + builtins: mark unused prefix parameters
201
- + builtins: annotate always-empty prefix parameters
202
- + builtins: always pass prefix to parse_options()
203
- + fast-import: fix file access when run from subdir
204
-
205
- Code clean-up for "-Wunused-parameter" build.
206
- source: <20230328205253.GA1753925@coredump.intra.peff.net>
207
-
208
-
209
-* ow/ref-format-remove-unused-member (2023-03-30) 1 commit
210
- (merged to 'next' on 2023-03-30 at 898a5df956)
211
- + ref-filter: remove unused ref_format member
50
+* ar/adjust-tests-for-the-index-fallout (2023-03-31) 2 commits
51
+ (merged to 'next' on 2023-04-06 at 8a9dfa25d4)
52
+ + t2107: fix mention of the_index.cache_changed
53
+ + t3060: fix mention of function prune_index
54
213
- Code clean-up.
214
- source: <20230330112133.4437-2-oystwa@gmail.com>
55
+ Comment updates.
56
+ source: <20230331143604.82040-2-rybak.a.v@gmail.com>
57
58
217
-* ps/ahead-behind-truncation-fix (2023-03-27) 1 commit
218
- (merged to 'next' on 2023-03-31 at 60bc243011)
219
- + commit-graph: fix truncated generation numbers
220
- (this branch uses ds/ahead-behind.)
59
+* dw/doc-submittingpatches-grammofix (2023-04-05) 1 commit
60
+ (merged to 'next' on 2023-04-06 at 1c48670236)
61
+ + SubmittingPatches: clarify MUA discussion with "the"
62
222
- Fix unnecessary truncation of generation numbers used in-core.
223
- source: <f8a0a869e8b0882f05cac49d78f49ba3553d3c44.1679904401.git.ps@pks.im>
63
+ Grammofix.
64
+ source: <ZC0yey+S+OD/S2tt@trent-reznor>
65
66
226
-* ps/fetch-ref-update-reporting (2023-03-20) 6 commits
227
- (merged to 'next' on 2023-03-30 at e5df1cae0b)
228
- + fetch: centralize printing of reference updates
229
- + fetch: centralize logic to print remote URL
230
- + fetch: centralize handling of per-reference format
231
- + fetch: pass the full local reference name to `format_display`
232
- + fetch: move output format into `display_state`
233
- + fetch: move reference width calculation into `display_state`
67
+* fc/doc-manpage-base-url-fix (2023-04-05) 1 commit
68
+ (merged to 'next' on 2023-04-07 at c764614b80)
69
+ + doc: remove manpage-base-url workaround
70
+
71
+ Modernize manpage generation toolchain.
72
+ source: <20230322000815.132128-1-felipe.contreras@gmail.com>
73
235
- Clean-up of the code path that reports what "git fetch" did to each
236
- ref.
237
- source: <cover.1679315383.git.ps@pks.im>
74
75
+* jc/clone-object-format-from-void (2023-04-05) 1 commit
76
+ (merged to 'next' on 2023-04-07 at 78eb68f3fa)
77
+ + clone: propagate object-format when cloning from void
78
240
-* sm/ssl-key-type-config (2023-03-23) 1 commit
241
- (merged to 'next' on 2023-03-30 at 773716fc60)
242
- + http: add support for different sslcert and sslkey types.
79
+ "git clone" from an empty repository learned to propagate the
80
+ choice of the hash algorithm from the source repository to the
81
+ newly created repository.
82
+ source: <xmqq355euj2i.fsf@gitster.g>
83
+
84
+
85
+* jc/spell-id-in-both-caps-in-message-id (2023-04-03) 1 commit
86
+ (merged to 'next' on 2023-04-06 at 17f4690220)
87
+ + e-mail workflow: Message-ID is spelled with ID in both capital letters
88
+
89
+ Consistently spell "Message-ID" as such, not "Message-Id".
90
+ source: <xmqqsfhgnmqg.fsf@gitster.g>
91
+
92
+
93
+* jk/use-perl-path-consistently (2023-04-06) 1 commit
94
+ (merged to 'next' on 2023-04-07 at 3aa36fcb80)
95
+ + t/lib-httpd: pass PERL_PATH to CGI scripts
96
+
97
+ Tests had a few places where we ignored PERL_PATH and blindly used
98
+ /usr/bin/perl, which have been corrected.
99
+ source: <20230406093602.GD2215039@coredump.intra.peff.net>
100
+
101
+
102
+* jx/cap-object-info-uninitialized-fix (2023-04-03) 1 commit
103
+ (merged to 'next' on 2023-04-06 at 5a8b6068f3)
104
+ + object-info: init request_info before reading arg
105
+
106
+ Correct use of an uninitialized structure member.
107
+ source: <20230402130557.17662-1-worldhello.net@gmail.com>
108
+
109
+
110
+* ws/sparse-check-rules (2023-03-27) 2 commits
111
+ (merged to 'next' on 2023-04-06 at 3fd16233c7)
112
+ + builtin/sparse-checkout: add check-rules command
113
+ + builtin/sparse-checkout: remove NEED_WORK_TREE flag
114
244
- Add a few configuration variables to tell the cURL library that
245
- different types of ssl-cert and ssl-key are in use.
246
- source: <pull.1474.v2.git.git.1679327330032.gitgitgadget@gmail.com>
115
+ "git sparse-checkout" command learns a debugging aid for the sparse
116
+ rule definitions.
117
+ source: <pull.1488.v2.git.1679903703.gitgitgadget@gmail.com>
118
119
--------------------------------------------------
120
[New Topics]
121
251
-* dw/doc-submittingpatches-grammofix (2023-04-05) 1 commit
252
- (merged to 'next' on 2023-04-05 at 2691fad020)
253
- + SubmittingPatches: clarify MUA discussion with "the"
254
-
255
- Originally merged to 'next' on 2023-04-05
122
+* la/mfc-markup-fix (2023-04-06) 1 commit
123
+ (merged to 'next' on 2023-04-10 at 05415e1c90)
124
+ + MyFirstContribution: render literal *
125
257
- Grammofix.
126
+ Documentation mark-up fix.
127
128
Will merge to 'master'.
260
- source: <ZC0yey+S+OD/S2tt@trent-reznor>
129
+ source: <pull.1510.git.1680661709616.gitgitgadget@gmail.com>
130
131
263
-* fc/doc-manpage-base-url-fix (2023-04-05) 1 commit
264
- - doc: remove manpage-base-url workaround
132
+* ar/t2024-checkout-output-fix (2023-04-10) 1 commit
133
+ - t2024: fix loose/strict local base branch DWIM test
134
266
- Modernize manpage generation toolchain.
135
+ Test fix.
136
137
Will merge to 'next'.
269
- source: <20230322000815.132128-1-felipe.contreras@gmail.com>
138
+ source: <20230408205450.569548-1-rybak.a.v@gmail.com>
139
140
272
-* jc/clone-object-format-from-void (2023-04-05) 1 commit
273
- - clone: propagate object-format when cloning from void
141
+* fc/doc-stop-using-manversion (2023-04-10) 1 commit
142
+ - doc: simplify man version
143
275
- "git clone" from an empty repository learned to propagate the
276
- choice of the hash algorithm from the source repository to the
277
- newly created repository.
144
+ Doc build simplification.
145
279
- Will merge to 'next'.
280
- source: <xmqq355euj2i.fsf@gitster.g>
146
+ Will merge to 'next'?
147
+ source: <20230408001829.11031-1-felipe.contreras@gmail.com>
148
149
283
-* rj/sendemail-validate-series-hook (2023-04-05) 1 commit
284
- - hooks: add sendemail-validate-series
150
+* rn/sparse-diff-index (2023-04-10) 1 commit
151
+ - diff-index: enable sparse index
152
286
- "git send-email" learns a new hook that takes the entire set of
287
- patch files from its standard input to validate them in one go,
288
- instead of getting called once per each file.
153
+ "git diff-index" command has been taught to work better with the
154
+ sparse index.
155
156
Comments?
291
- source: <20230405231305.96996-1-robin@jarry.cc>
157
+ source: <20230408112342.404318-1-nanth.raghul@gmail.com>
158
159
294
-* tk/mergetool-gui-default-config (2023-04-05) 1 commit
295
- - mergetool: new config guiDefault supports auto-toggling gui by DISPLAY
160
+* rs/get-tar-commit-id-use-defined-const (2023-04-10) 1 commit
161
+ - get-tar-commit-id: use TYPEFLAG_GLOBAL_HEADER instead of magic value
162
297
- "git mergetool" and "git difftool" learns a new configuration
298
- guiDefault to optionally favor configured guitool over non-gui-tool
299
- automatically when $DISPLAY is set.
163
+ Code clean-up to replace a hardcoded constant with a CPP macro.
164
165
Will merge to 'next'.
302
- source: <pull.1381.v4.git.1679153263217.gitgitgadget@gmail.com>
166
+ source: <79497392-0296-2ae3-2560-1f90c1a309b5@web.de>
167
168
305
-* cm/branch-delete-error-message-update (2023-04-06) 1 commit
306
- - branch: improve error log on branch not found by checking remotes refs
169
+* rs/remove-approxidate-relative (2023-04-10) 1 commit
170
+ - date: remove approxidate_relative()
171
308
- "git branch -d origin/master" would say "no such branch", but it is
309
- likely a missed "-r" if refs/remotes/origin/master exists. The
310
- command has been taught to give such a hint in its error message.
172
+ The approxidate() API has been simplified by losing an extra
173
+ function that did the same thing as another one.
174
312
- Will merge to 'next'?
313
- source: <pull.1476.v3.git.git.1680695000257.gitgitgadget@gmail.com>
175
+ Will merge to 'next'.
176
+ source: <f5b9a290-7cec-7a83-660b-e15494d2cdc8@web.de>
177
178
316
-* fc/remove-header-workarounds-for-asciidoc (2023-04-05) 1 commit
317
- - doc: asciidoc: remove custom header macro
179
+* rs/userdiff-multibyte-regex (2023-04-07) 1 commit
180
+ - userdiff: support regexec(3) with multi-byte support
181
319
- Doc toolchain update to remove old workaround for AsciiDoc.
182
+ The userdiff regexp patterns for various filetypes that are built
183
+ into the system have been updated to avoid triggering regexp errors
184
+ from UTF-8 aware regex engines.
185
321
- Will merge to 'next'?
322
- source: <20230323221523.52472-1-felipe.contreras@gmail.com>
186
+ Will merge to 'next'.
187
+ source: <7327ac06-d5da-ec53-543e-78e7729e78bb@web.de>
188
189
325
-* jk/use-perl-path-consistently (2023-04-06) 1 commit
326
- - t/lib-httpd: pass PERL_PATH to CGI scripts
190
+* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit
191
+ - usage: clarify --recurse-submodules as a boolean
192
328
- Tests had a few places where we ignored PERL_PATH and blindly used
329
- /usr/bin/perl, which have been corrected.
193
+ The "--[no-]recurse-submodules" option of "git checkout" and others
194
+ supported an undocumented syntax --recurse-submodules=<value> where
195
+ the value can spell a Boolean in various ways. The support for the
196
+ syntax is being dropped.
197
+
198
+ Comments?
199
+ source: <ZDSTFwMFO7vbj/du@google.com>
200
+
201
+
202
+* gc/better-error-when-local-clone-fails-with-symlink (2023-04-11) 1 commit
203
+ - clone: error specifically with --local and symlinked objects
204
+
205
+ "git clone --local" stops copying from an original repository that
206
+ has symbolic links inside its $GIT_DIR; an error message when that
207
+ happens has been updated.
208
209
Will merge to 'next'.
332
- source: <20230406093602.GD2215039@coredump.intra.peff.net>
210
+ source: <pull.1488.v2.git.git.1681165130765.gitgitgadget@gmail.com>
211
212
--------------------------------------------------
213
[Stalled]
@@ -418,49 +296,69 @@ Release tarballs are available at:
296
--------------------------------------------------
297
[Cooking]
298
421
-* ow/ref-filter-omit-empty (2023-04-06) 1 commit
422
- - branch, for-each-ref: add option to omit empty lines
299
+* rj/sendemail-validate-series-hook (2023-04-05) 1 commit
300
+ - hooks: add sendemail-validate-series
301
424
- "git branch --format=..." and "git format-patch --format=..."
425
- learns "--omit-empty" to hide refs that whose formatting result
426
- becomes an empty string from the output.
302
+ "git send-email" learns a new hook that takes the entire set of
303
+ patch files from its standard input to validate them in one go,
304
+ instead of getting called once per each file.
305
428
- Looking good.
429
- source: <20230406170837.10060-3-oystwa@gmail.com>
306
+ Comments?
307
+ source: <20230405231305.96996-1-robin@jarry.cc>
308
309
432
-* jc/spell-id-in-both-caps-in-message-id (2023-04-03) 1 commit
433
- (merged to 'next' on 2023-04-04 at 4cfa5997eb)
434
- + e-mail workflow: Message-ID is spelled with ID in both capital letters
310
+* tk/mergetool-gui-default-config (2023-04-05) 1 commit
311
+ (merged to 'next' on 2023-04-10 at 228432526c)
312
+ + mergetool: new config guiDefault supports auto-toggling gui by DISPLAY
313
436
- Originally merged to 'next' on 2023-04-04
314
+ "git mergetool" and "git difftool" learns a new configuration
315
+ guiDefault to optionally favor configured guitool over non-gui-tool
316
+ automatically when $DISPLAY is set.
317
+
318
+ Will merge to 'master'.
319
+ source: <pull.1381.v4.git.1679153263217.gitgitgadget@gmail.com>
320
438
- Consistently spell "Message-ID" as such, not "Message-Id".
321
+
322
+* cm/branch-delete-error-message-update (2023-04-06) 1 commit
323
+ (merged to 'next' on 2023-04-10 at 09c987c822)
324
+ + branch: improve error log on branch not found by checking remotes refs
325
+
326
+ "git branch -d origin/master" would say "no such branch", but it is
327
+ likely a missed "-r" if refs/remotes/origin/master exists. The
328
+ command has been taught to give such a hint in its error message.
329
330
Will merge to 'master'.
441
- source: <xmqqsfhgnmqg.fsf@gitster.g>
331
+ source: <pull.1476.v3.git.git.1680695000257.gitgitgadget@gmail.com>
332
333
444
-* rn/sparse-describe (2023-04-03) 1 commit
445
- - describe: enable sparse index for describe
334
+* fc/remove-header-workarounds-for-asciidoc (2023-04-05) 1 commit
335
+ (merged to 'next' on 2023-04-10 at f08eab44f2)
336
+ + doc: asciidoc: remove custom header macro
337
447
- "git describe --dirty" learns to work better with sparse-index.
338
+ Doc toolchain update to remove old workaround for AsciiDoc.
339
449
- Will merge to 'next'?
450
- source: <20230403164749.246001-1-nanth.raghul@gmail.com>
340
+ Will merge to 'master'.
341
+ source: <20230323221523.52472-1-felipe.contreras@gmail.com>
342
343
453
-* ar/adjust-tests-for-the-index-fallout (2023-03-31) 2 commits
454
- (merged to 'next' on 2023-04-04 at 48861fc381)
455
- + t2107: fix mention of the_index.cache_changed
456
- + t3060: fix mention of function prune_index
344
+* ow/ref-filter-omit-empty (2023-04-07) 1 commit
345
+ - branch, for-each-ref, tag: add option to omit empty lines
346
458
- Originally merged to 'next' on 2023-04-04
347
+ "git branch --format=..." and "git format-patch --format=..."
348
+ learns "--omit-empty" to hide refs that whose formatting result
349
+ becomes an empty string from the output.
350
460
- Comment updates.
351
+ Will merge to 'next'?
352
+ source: <20230407175316.6404-1-oystwa@gmail.com>
353
462
- Will merge to 'master'.
463
- source: <20230331143604.82040-2-rybak.a.v@gmail.com>
354
+
355
+* rn/sparse-describe (2023-04-03) 1 commit
356
+ - describe: enable sparse index for describe
357
+
358
+ "git describe --dirty" learns to work better with sparse-index.
359
+
360
+ Will merge to 'next'?
361
+ source: <20230403164749.246001-1-nanth.raghul@gmail.com>
362
363
364
* ah/format-patch-thread-doc (2023-04-03) 1 commit
@@ -484,11 +382,10 @@ Release tarballs are available at:
382
source: <20230403223338.468025-1-rybak.a.v@gmail.com>
383
384
487
-* en/header-split-cache-h (2023-04-04) 25 commits
385
+* en/header-split-cache-h (2023-04-11) 24 commits
386
- mailmap, quote: move declarations of global vars to correct unit
387
- treewide: reduce includes of cache.h in other headers
388
- treewide: remove double forward declaration of read_in_full
491
- - strbuf: move forward declarations to beginning of file
389
- cache.h: remove unnecessary includes
390
- treewide: remove cache.h inclusion due to pager.h changes
391
- pager.h: move declarations for pager.c functions from cache.h
@@ -513,28 +410,17 @@ Release tarballs are available at:
410
411
Header clean-up.
412
516
- Will merge to 'next'?
517
- source: <pull.1509.v2.git.1680571348.gitgitgadget@gmail.com>
518
-
519
-
520
-* jx/cap-object-info-uninitialized-fix (2023-04-03) 1 commit
521
- (merged to 'next' on 2023-04-05 at d56fe6eedc)
522
- + object-info: init request_info before reading arg
523
-
524
- Originally merged to 'next' on 2023-04-05
525
-
526
- Correct use of an uninitialized structure member.
527
-
528
- Will merge to 'master'.
529
- source: <20230402130557.17662-1-worldhello.net@gmail.com>
413
+ Will merge to 'next'.
414
+ source: <pull.1509.v3.git.1681182060.gitgitgadget@gmail.com>
415
416
417
* sl/sparse-write-tree (2023-04-04) 1 commit
533
- - write-tree: integrate with sparse index
418
+ (merged to 'next' on 2023-04-10 at 0cd39c23b1)
419
+ + write-tree: integrate with sparse index
420
421
"git write-tree" learns to work better with sparse-index.
422
537
- Will merge to 'next'.
423
+ Will merge to 'master'.
424
source: <20230404003539.1578245-1-cheskaqiqi@gmail.com>
425
426
@@ -549,20 +435,6 @@ Release tarballs are available at:
435
source: <pull.1503.git.1679678090412.gitgitgadget@gmail.com>
436
437
552
-* ws/sparse-check-rules (2023-03-27) 2 commits
553
- (merged to 'next' on 2023-04-04 at 17a29244a6)
554
- + builtin/sparse-checkout: add check-rules command
555
- + builtin/sparse-checkout: remove NEED_WORK_TREE flag
556
-
557
- Originally merged to 'next' on 2023-04-04
558
-
559
- "git sparse-checkout" command learns a debugging aid for the sparse
560
- rule definitions.
561
-
562
- Will merge to 'master'.
563
- source: <pull.1488.v2.git.1679903703.gitgitgadget@gmail.com>
564
-
565
-
438
* mh/credential-password-expiry-wincred (2023-04-03) 1 commit
439
- credential/wincred: store password_expiry_utc
440
@@ -612,19 +484,17 @@ Release tarballs are available at:
484
485
486
* tb/pack-bitmap-index-seek (2023-03-20) 6 commits
615
- (merged to 'next' on 2023-03-21 at b579e226b5)
616
- + pack-bitmap.c: factor out `bitmap_index_seek_commit()`
617
- + pack-bitmap.c: use `bitmap_index_seek()` where possible
618
- + pack-bitmap.c: factor out manual `map_pos` manipulation
619
- + pack-bitmap.c: drop unnecessary 'inline's
620
- + pack-bitmap.c: hide bitmap internals in `read_be32()`
621
- + pack-bitmap.c: hide bitmap internals in `read_u8()`
622
-
623
- Originally merged to 'next' on 2023-03-21
487
+ - pack-bitmap.c: factor out `bitmap_index_seek_commit()`
488
+ - pack-bitmap.c: use `bitmap_index_seek()` where possible
489
+ - pack-bitmap.c: factor out manual `map_pos` manipulation
490
+ - pack-bitmap.c: drop unnecessary 'inline's
491
+ - pack-bitmap.c: hide bitmap internals in `read_be32()`
492
+ - pack-bitmap.c: hide bitmap internals in `read_u8()`
493
494
Clean-up the pack-bitmap codepath.
495
627
- On hold. There is a BUG() on data errors.
496
+ Kicked back to 'seen' out of 'next'.
497
+ There is a BUG() on data errors that needs to be fixed.
498
source: <cover.1679342296.git.me@ttaylorr.com>
499
500
@@ -658,16 +528,19 @@ Release tarballs are available at:
528
source: <pull.1469.v2.git.git.1679729764851.gitgitgadget@gmail.com>
529
530
661
-* pw/rebase-cleanup-merge-strategy-option-handling (2023-04-05) 5 commits
662
- - rebase: remove a couple of redundant strategy tests
663
- - rebase -m: fix serialization of strategy options
664
- - rebase -m: cleanup --strategy-option handling
665
- - sequencer: use struct strvec to store merge strategy options
666
- - rebase: stop reading and writing unnecessary strategy state
531
+* pw/rebase-cleanup-merge-strategy-option-handling (2023-04-10) 5 commits
532
+ (merged to 'next' on 2023-04-11 at a3b1fd5ec7)
533
+ + rebase: remove a couple of redundant strategy tests
534
+ + rebase -m: fix serialization of strategy options
535
+ + rebase -m: cleanup --strategy-option handling
536
+ + sequencer: use struct strvec to store merge strategy options
537
+ + rebase: stop reading and writing unnecessary strategy state
538
539
Clean-up of the code path that deals with merge strategy option
540
handling in "git rebase".
670
- source: <cover.1680708043.git.phillip.wood@dunelm.org.uk>
541
+
542
+ Will merge to 'master'.
543
+ source: <cover.1681117706.git.phillip.wood@dunelm.org.uk>
544
545
546
* sl/diff-files-sparse (2023-03-22) 2 commits