What's cooking (2022/09 #04)
Junio C Hamano committed
Sep 15, 2022 at 16:28 UTC
b13b9e01589aef37bb54b603dffa831b8def99fc
1 file changed
+246
-299
whats-cooking.txt
+246
-299
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Sep 2022, #03; Tue, 13)
3
-X-master-at: e188ec3a735ae52a0d0d3c22f9df6b29fa613b1e
4
-X-next-at: b38f19008aff4c52573f00da5d2d3bfd3877fcfc
2
+Subject: What's cooking in git.git (Sep 2022, #04; Thu, 15)
3
+X-master-at: d3fa443f97e3a8d75b51341e2d5bac380b7422df
4
+X-next-at: 21cbab75150d71ca294e09180c59ee529ca53957
5
6
-What's cooking in git.git (Sep 2022, #03; Tue, 13)
6
+What's cooking in git.git (Sep 2022, #04; Thu, 15)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -13,12 +13,11 @@ release). Commits prefixed with '-' are only in 'seen', and aren't
13
considered "accepted" at all. A topic without enough support may be
14
discarded after a long period of no activity.
15
16
-It is expected to be a bit slower week than usual, as many of our
17
-contributors are flying to Chicago and back, with a bit of fun in
18
-the conference in between. We'll tag the first release candidate
19
-next week (cf. https://tinyurl.com/gitCal), and it will hopefully
20
-start to become even quieter after that, with only regression fixes
21
-and nothing else.
16
+I tagged the tip of the 'master' branch as 2.38-rc0, aka "preview",
17
+but since many folks are away attending Git Merge, expect not much
18
+activity on the release. The first "release candidate" that signals
19
+the start of pre-release feature freeze is scheduled to happen mid
20
+next week (cf. http://tinyurl.com/gitCal).
21
22
Copies of the source code to Git live in many repositories, and the
23
following is a list of the ones I push into or their mirrors. Some
@@ -51,152 +50,115 @@ Release tarballs are available at:
50
--------------------------------------------------
51
[Graduated to 'master']
52
54
-* ab/submodule-helper-prep (2022-09-02) 33 commits
55
- (merged to 'next' on 2022-09-05 at b0d1b6ada7)
56
- + submodule--helper: fix bad config API usage
57
- + submodule--helper: libify even more "die" paths for module_update()
58
- + submodule--helper: libify more "die" paths for module_update()
59
- + submodule--helper: check repo{_submodule,}_init() return values
60
- + submodule--helper: libify "must_die_on_failure" code paths (for die)
61
- + submodule--helper update: don't override 'checkout' exit code
62
- + submodule--helper: libify "must_die_on_failure" code paths
63
- + submodule--helper: libify determine_submodule_update_strategy()
64
- + submodule--helper: don't exit() on failure, return
65
- + submodule--helper: use "code" in run_update_command()
66
- + submodule API: don't handle SM_..{UNSPECIFIED,COMMAND} in to_string()
67
- + submodule--helper: don't call submodule_strategy_to_string() in BUG()
68
- + submodule--helper: add missing braces to "else" arm
69
- + submodule--helper: return "ret", not "1" from update_submodule()
70
- + submodule--helper: rename "int res" to "int ret"
71
- + submodule--helper: don't redundantly check "else if (res)"
72
- + submodule--helper: refactor "errmsg_str" to be a "struct strbuf"
73
- + submodule--helper: add "const" to passed "struct update_data"
74
- + submodule--helper: add "const" to copy of "update_data"
75
- + submodule--helper: add "const" to passed "module_clone_data"
76
- + submodule--helper: move "sb" in clone_submodule() to its own scope
77
- + submodule--helper: use xstrfmt() in clone_submodule()
78
- + submodule--helper: replace memset() with { 0 }-initialization
79
- + submodule--helper style: add \n\n after variable declarations
80
- + submodule--helper style: don't separate declared variables with \n\n
81
- + submodule--helper: move "resolve-relative-url-test" to a test-tool
82
- + submodule--helper: move "check-name" to a test-tool
83
- + submodule--helper: move "is-active" to a test-tool
84
- + test-tool submodule-config: remove unused "--url" handling
85
- + submodule--helper: remove unused "list" helper
86
- + submodule--helper: remove unused "name" helper
87
- + submodule tests: test for "add <repository> <abs-path>"
88
- + submodule tests: test usage behavior
89
- (this branch is used by ab/submodule-helper-leakfix.)
90
-
91
- Code clean-up of "git submodule--helper".
92
- source: <cover-v4-00.33-00000000000-20220831T230519Z-avarab@gmail.com>
93
-
94
-
95
-* ed/fsmonitor-on-network-disk (2022-08-11) 1 commit
96
- (merged to 'next' on 2022-08-14 at 637d458d9c)
97
- + fsmonitor: option to allow fsmonitor to run against network-mounted repos
98
-
99
- The built-in fsmonitor refuses to work on a network mounted
100
- repositories; a configuration knob for users to override this has
101
- been introduced.
102
- source: <pull.1317.v4.git.1660262231357.gitgitgadget@gmail.com>
103
-
104
-
105
-* jk/rev-list-verify-objects-fix (2022-09-07) 2 commits
106
- (merged to 'next' on 2022-09-07 at 5da58e2145)
107
- + rev-list: disable commit graph with --verify-objects
108
- + lookup_commit_in_graph(): use prepare_commit_graph() to check for graph
109
-
110
- "git rev-list --verify-objects" ought to inspect the contents of
111
- objects and notice corrupted ones, but it didn't when the commit
112
- graph is in use, which has been corrected.
113
- source: <Yxe0k++LA/UfFLF/@coredump.intra.peff.net>
114
-
115
-
116
-* jk/upload-pack-skip-hash-check (2022-09-07) 4 commits
117
- (merged to 'next' on 2022-09-07 at f638a5a7c9)
118
- + t1060: check partial clone of misnamed blob
119
- + parse_object(): check commit-graph when skip_hash set
120
- + upload-pack: skip parse-object re-hashing of "want" objects
121
- + parse_object(): allow skipping hash check
122
-
123
- The server side that responds to "git fetch" and "git clone"
124
- request has been optimized by allowing it to send objects in its
125
- object store without recomputing and validating the object names.
126
- source: <YxfQi4qg8uJHs7Gp@coredump.intra.peff.net>
127
- source: <YxkAxutS+B8//0WF@coredump.intra.peff.net>
128
-
129
-
130
-* js/builtin-add-p-portability-fix (2022-08-30) 3 commits
131
- (merged to 'next' on 2022-09-08 at 8d3e72e890)
132
- + t6132(NO_PERL): do not run the scripted `add -p`
133
- + t3701: test the built-in `add -i` regardless of NO_PERL
134
- + add -p: avoid ambiguous signed/unsigned comparison
135
-
136
- More fixes to "add -p"
137
- source: <pull.1340.git.1661867664.gitgitgadget@gmail.com>
138
-
139
-
140
-* ow/rev-parse-parseopt-fix (2022-09-08) 1 commit
141
- (merged to 'next' on 2022-09-08 at a15efb3478)
142
- + rev-parse --parseopt: detect missing opt-spec
143
-
144
- The parser in the script interface to parse-options in "git
145
- rev-parse" has been updated to diagnose a bogus input correctly.
146
- source: <20220902175902.22346-1-oystwa@gmail.com>
147
-
148
-
149
-* rs/diff-no-index-cleanup (2022-09-07) 3 commits
150
- (merged to 'next' on 2022-09-07 at a305340e6f)
151
- + diff-no-index: simplify argv index calculation
152
- + diff-no-index: release prefixed filenames
153
- + diff-no-index: release strbuf on queue error
154
- (this branch is used by jc/diff-no-index-two-stdin.)
155
-
156
- "git diff --no-index A B" managed its the pathnames of its two
157
- input files rather haphazardly, sometimes leaking them. The
158
- command line argument processing has been straightened out to clean
159
- it up.
160
- source: <xmqq8rmx1saz.fsf@gitster.g>
161
-
162
-
163
-* sg/parse-options-subcommand (2022-09-07) 5 commits
164
- (merged to 'next' on 2022-09-07 at e71f9b1de6)
165
- + notes, remote: show unknown subcommands between `'
166
- + notes: simplify default operation mode arguments check
167
- + test-parse-options.c: fix style of comparison with zero
168
- + test-parse-options.c: don't use for loop initial declaration
169
- + t0040-parse-options: remove leftover debugging
170
-
171
- The codepath for the OPT_SUBCOMMAND facility has been cleaned up.
172
- source: <20220905185007.9042-1-szeder.dev@gmail.com>
53
+* ab/dedup-config-and-command-docs (2022-09-07) 9 commits
54
+ (merged to 'next' on 2022-09-08 at cd5b217110)
55
+ + docs: add CONFIGURATION sections that fuzzy map to built-ins
56
+ + docs: add CONFIGURATION sections that map to a built-in
57
+ + log docs: de-duplicate configuration sections
58
+ + difftool docs: de-duplicate configuration sections
59
+ + notes docs: de-duplicate and combine configuration sections
60
+ + apply docs: de-duplicate configuration sections
61
+ + send-email docs: de-duplicate configuration sections
62
+ + grep docs: de-duplicate configuration sections
63
+ + docs: add and use include template for config/* includes
64
174
---------------------------------------------------
175
-[New Topics]
65
+ Share the text used to explain configuration variables used by "git
66
+ <subcmd>" in "git help <subcmd>" with the text from "git help config".
67
+ cf. <CAHd-oW71qvhG16YtMweA26SDCLKn+LHZe13njn18CD==9Ewbnw@mail.gmail.com>
68
+ source: <cover-v4-0.9-00000000000-20220907T082419Z-avarab@gmail.com>
69
177
-* jk/list-objects-filter-cleanup (2022-09-12) 5 commits
178
- (merged to 'next' on 2022-09-12 at 33cb79c924)
179
- + list-objects-filter: convert filter_spec to a strbuf
180
- + list-objects-filter: add and use initializers
181
- + list-objects-filter: handle null default filter spec
182
- + list-objects-filter: don't memset after releasing filter struct
183
- + Merge branch 'jk/plug-list-object-filter-leaks' into jk/list-objects-filter-cleanup
184
- (this branch uses jk/plug-list-object-filter-leaks.)
70
186
- A couple of bugfixes with code clean-up.
71
+* ab/submodule-helper-leakfix (2022-09-02) 18 commits
72
+ (merged to 'next' on 2022-09-08 at bf21cfed4b)
73
+ + submodule--helper: fix a configure_added_submodule() leak
74
+ + submodule--helper: free rest of "displaypath" in "struct update_data"
75
+ + submodule--helper: free some "displaypath" in "struct update_data"
76
+ + submodule--helper: fix a memory leak in print_status()
77
+ + submodule--helper: fix a leak in module_add()
78
+ + submodule--helper: fix obscure leak in module_add()
79
+ + submodule--helper: fix "reference" leak
80
+ + submodule--helper: fix a memory leak in get_default_remote_submodule()
81
+ + submodule--helper: fix a leak with repo_clear()
82
+ + submodule--helper: fix "sm_path" and other "module_cb_list" leaks
83
+ + submodule--helper: fix "errmsg_str" memory leak
84
+ + submodule--helper: add and use *_release() functions
85
+ + submodule--helper: don't leak {run,capture}_command() cp.dir argument
86
+ + submodule--helper: "struct pathspec" memory leak in module_update()
87
+ + submodule--helper: fix most "struct pathspec" memory leaks
88
+ + submodule--helper: fix trivial get_default_remote_submodule() leak
89
+ + submodule--helper: fix a leak in "clone_submodule"
90
+ + Merge branch 'ab/submodule-helper-prep' into ab/submodule-helper-leakfix
91
188
- Will merge to 'master'.
189
- source: <Yx1qwlpNbxGEiUgc@coredump.intra.peff.net>
92
+ Plugging leaks in submodule--helper.
93
+ source: <cover-v7-00.17-00000000000-20220831T231003Z-avarab@gmail.com>
94
95
192
-* zh/ls-files-format (2022-09-12) 1 commit
193
- (merged to 'next' on 2022-09-12 at 91dda58387)
194
- + ls-files: fix black space in error message
96
+* ab/unused-annotation (2022-09-01) 2 commits
97
+ (merged to 'next' on 2022-09-08 at dfc6123c6b)
98
+ + git-compat-util.h: use "deprecated" for UNUSED variables
99
+ + git-compat-util.h: use "UNUSED", not "UNUSED(var)"
100
+ (this branch uses jk/unused-annotation.)
101
196
- Typofix in the UI of a topic that has graduated to 'master'.
102
+ Undoes 'jk/unused-annotation' topic and redoes it to work around
103
+ Coccinelle rules misfiring false positives in unrelated codepaths.
104
+ source: <cover-0.2-00000000000-20220825T170709Z-avarab@gmail.com>
105
198
- Will merge to 'master'.
199
- source: <pull.1350.git.1662904997760.gitgitgadget@gmail.com>
106
+
107
+* en/remerge-diff-fixes (2022-09-02) 3 commits
108
+ (merged to 'next' on 2022-09-12 at 9879cec049)
109
+ + diff: fix filtering of merge commits under --remerge-diff
110
+ + diff: fix filtering of additional headers under --remerge-diff
111
+ + diff: have submodule_format logic avoid additional diff headers
112
+
113
+ Fix a few "git log --remerge-diff" bugs.
114
+ source: <pull.1342.v3.git.1662090810.gitgitgadget@gmail.com>
115
+
116
+
117
+* jk/plug-list-object-filter-leaks (2022-09-08) 5 commits
118
+ (merged to 'next' on 2022-09-08 at a6b4b080e4)
119
+ + prepare_repo_settings(): plug leak of config values
120
+ + list_objects_filter_options: plug leak of filter_spec strings
121
+ + transport: free filter options in disconnect_git()
122
+ + transport: deep-copy object-filter struct for fetch-pack
123
+ + list_objects_filter_copy(): deep-copy sparse_oid_name field
124
+ (this branch is used by jk/list-objects-filter-cleanup.)
125
+
126
+ The code that manages list-object-filter structure, used in partial
127
+ clones, leaked the instances, which has been plugged.
128
+ source: <Yxl1BNQoy6Drf0Oe@coredump.intra.peff.net>
129
+
130
+
131
+* jk/proto-v2-ref-prefix-fix (2022-09-08) 2 commits
132
+ (merged to 'next' on 2022-09-12 at 70c5528b86)
133
+ + fetch: add branch.*.merge to default ref-prefix extension
134
+ + fetch: stop checking for NULL transport->remote in do_fetch()
135
+
136
+ "git fetch" over protocol v2 sent an incorrect ref prefix request
137
+ to the server and made "git pull" with configured fetch refspec
138
+ that does not cover the remote branch to merge with fail, which has
139
+ been corrected.
140
+ source: <YxpBMaIckimFJYEi@coredump.intra.peff.net>
141
+
142
+
143
+* jk/unused-annotation (2022-08-19) 11 commits
144
+ (merged to 'next' on 2022-08-24 at 2174b8c75d)
145
+ + is_path_owned_by_current_uid(): mark "report" parameter as unused
146
+ + run-command: mark unused async callback parameters
147
+ + mark unused read_tree_recursive() callback parameters
148
+ + hashmap: mark unused callback parameters
149
+ + config: mark unused callback parameters
150
+ + streaming: mark unused virtual method parameters
151
+ + transport: mark bundle transport_options as unused
152
+ + refs: mark unused virtual method parameters
153
+ + refs: mark unused reflog callback parameters
154
+ + refs: mark unused each_ref_fn parameters
155
+ + git-compat-util: add UNUSED macro
156
+ (this branch is used by ab/unused-annotation.)
157
+
158
+ Annotate function parameters that are not used (but cannot be
159
+ removed for structural reasons), to prepare us to later compile
160
+ with -Wunused warning turned on.
161
+ source: <Yv9gxqH6nK2KYnNj@coredump.intra.peff.net>
162
163
164
* js/typofix (2022-09-12) 1 commit
@@ -204,9 +166,96 @@ Release tarballs are available at:
166
+ Documentation: fix various repeat word typos
167
168
Typofix.
169
+ source: <20220911102320.39954-2-jacob@initialcommit.io>
170
+
171
+
172
+* rs/add-p-worktree-mode-prompt-fix (2022-09-14) 1 commit
173
+ (merged to 'next' on 2022-09-14 at 5f29a569d4)
174
+ + add -p: fix worktree patch mode prompts
175
+
176
+ Fix another UI regression in the reimplemented "add -p".
177
+ source: <2463c4b9-313b-032f-9313-d1421f71f111@web.de>
178
+
179
+--------------------------------------------------
180
+[New Topics]
181
+
182
+* ed/fsmonitor-on-networked-macos (2022-09-13) 5 commits
183
+ - fsmonitor: add documentation for allowRemote and socketDir options
184
+ - fsmonitor: deal with synthetic firmlinks on macOS
185
+ - fsmonitor: avoid socket location check if using hook
186
+ - fsmonitor: relocate socket file if .git directory is remote
187
+ - fsmonitor: refactor filesystem checks to common interface
188
+
189
+ By default, use of fsmonitor on a repository on networked
190
+ filesystem is disabled. Add knobs to make it workable on macOS.
191
+
192
+ Needs review.
193
+ source: <pull.1326.v6.git.1663100858.gitgitgadget@gmail.com>
194
+
195
+
196
+* rj/branch-edit-description-with-nth-checkout (2022-09-12) 2 commits
197
+ - branch: support for shortcuts like @{-1} completed
198
+ - branch: refactor "edit_description" code path
199
+
200
+ "git branch --edit-description @{-1}" is now a way to edit branch
201
+ description of the branch you were on before switching to the
202
+ current branch.
203
+
204
+ Needs review.
205
+ source: <7abdb5a9-5707-7897-4196-8d2892beeb81@gmail.com>
206
+
207
+
208
+* mj/credential-helper-auth-headers (2022-09-13) 8 commits
209
+ - http: set specific auth scheme depending on credential
210
+ - http: move proactive auth to first slot creation
211
+ - http: store all request headers on active_request_slot
212
+ - credential: add WWW-Authenticate header to cred requests
213
+ - http: read HTTP WWW-Authenticate response headers
214
+ - osxkeychain: clarify that we ignore unknown lines
215
+ - netrc: ignore unknown lines (do not die)
216
+ - wincred: ignore unknown lines (do not die)
217
+
218
+ RFC
219
+ source: <pull.1352.git.1663097156.gitgitgadget@gmail.com>
220
+
221
+
222
+* ec/reftable-pass-pq-entry-by-reference (2022-09-15) 1 commit
223
+ (merged to 'next' on 2022-09-15 at 928e75c7d1)
224
+ + reftable: use a pointer for pq_entry param
225
+
226
+ Small code clean-up in reftable implementation.
227
228
Will merge to 'master'.
209
- source: <20220911102320.39954-2-jacob@initialcommit.io>
229
+ source: <1833f3928cb.acf3c97d869879.7909589521159235166@elijahpepe.com>
230
+
231
+
232
+* jc/environ-docs (2022-09-15) 5 commits
233
+ - environ: GIT_INDEX_VERSION affects not just a new repository
234
+ - environ: simplify description of GIT_INDEX_FILE
235
+ - environ: GIT_FLUSH should be made a usual Boolean
236
+ - environ: explain Boolean environment variables
237
+ - environ: document GIT_SSL_NO_VERIFY
238
+
239
+ Documentation on various Boolean GIT_* environment variables have
240
+ been clarified.
241
+
242
+ Needs review.
243
+ source: <20220915160659.126441-1-gitster@pobox.com>
244
+
245
+
246
+* rs/diff-caret-bang-with-parents (2022-09-15) 6 commits
247
+ - revision: add parents after child for ^!
248
+ - revision: rename add_parents_only() to add_nth_parent()
249
+ - revision: factor out add_parents()
250
+ - revision: factor out add_parent()
251
+ - revision: factor out get_commit()
252
+ - revision: use strtol_i() for exclude_parent
253
+
254
+ "git diff rev^!" did not show combined diff to go to the rev from
255
+ its parents.
256
+
257
+ Needs review.
258
+ source: <ba6eea28-fb3a-b376-2529-351727c02f1a@web.de>
259
260
--------------------------------------------------
261
[Stalled]
@@ -252,6 +301,30 @@ Release tarballs are available at:
301
--------------------------------------------------
302
[Cooking]
303
304
+* jk/list-objects-filter-cleanup (2022-09-12) 5 commits
305
+ (merged to 'next' on 2022-09-12 at 33cb79c924)
306
+ + list-objects-filter: convert filter_spec to a strbuf
307
+ + list-objects-filter: add and use initializers
308
+ + list-objects-filter: handle null default filter spec
309
+ + list-objects-filter: don't memset after releasing filter struct
310
+ + Merge branch 'jk/plug-list-object-filter-leaks' into jk/list-objects-filter-cleanup
311
+
312
+ A couple of bugfixes with code clean-up.
313
+
314
+ Will merge to 'master'.
315
+ source: <Yx1qwlpNbxGEiUgc@coredump.intra.peff.net>
316
+
317
+
318
+* zh/ls-files-format (2022-09-12) 1 commit
319
+ (merged to 'next' on 2022-09-12 at 91dda58387)
320
+ + ls-files: fix black space in error message
321
+
322
+ Typofix in the UI of a topic that has graduated to 'master'.
323
+
324
+ Will merge to 'master'.
325
+ source: <pull.1350.git.1662904997760.gitgitgadget@gmail.com>
326
+
327
+
328
* ab/doc-synopsis-and-cmd-usage (2022-09-07) 34 commits
329
- tests: start asserting that *.txt SYNOPSIS matches -h output
330
- doc txt & -h consistency: make "worktree" consistent
@@ -296,36 +369,6 @@ Release tarballs are available at:
369
source: <cover-00.34-00000000000-20220902T092734Z-avarab@gmail.com>
370
371
299
-* jk/plug-list-object-filter-leaks (2022-09-08) 5 commits
300
- (merged to 'next' on 2022-09-08 at a6b4b080e4)
301
- + prepare_repo_settings(): plug leak of config values
302
- + list_objects_filter_options: plug leak of filter_spec strings
303
- + transport: free filter options in disconnect_git()
304
- + transport: deep-copy object-filter struct for fetch-pack
305
- + list_objects_filter_copy(): deep-copy sparse_oid_name field
306
- (this branch is used by jk/list-objects-filter-cleanup.)
307
-
308
- The code that manages list-object-filter structure, used in partial
309
- clones, leaked the instances, which has been plugged.
310
-
311
- Will merge to 'master'.
312
- source: <Yxl1BNQoy6Drf0Oe@coredump.intra.peff.net>
313
-
314
-
315
-* jk/proto-v2-ref-prefix-fix (2022-09-08) 2 commits
316
- (merged to 'next' on 2022-09-12 at 70c5528b86)
317
- + fetch: add branch.*.merge to default ref-prefix extension
318
- + fetch: stop checking for NULL transport->remote in do_fetch()
319
-
320
- "git fetch" over protocol v2 sent an incorrect ref prefix request
321
- to the server and made "git pull" with configured fetch refspec
322
- that does not cover the remote branch to merge with fail, which has
323
- been corrected.
324
-
325
- Will merge to 'master'.
326
- source: <YxpBMaIckimFJYEi@coredump.intra.peff.net>
327
-
328
-
372
* vd/doc-reviewing-guidelines (2022-09-09) 1 commit
373
- Documentation: add ReviewingGuidelines
374
@@ -336,19 +379,6 @@ Release tarballs are available at:
379
source: <pull.1348.git.1662747205235.gitgitgadget@gmail.com>
380
381
339
-* ab/unused-annotation (2022-09-01) 2 commits
340
- (merged to 'next' on 2022-09-08 at dfc6123c6b)
341
- + git-compat-util.h: use "deprecated" for UNUSED variables
342
- + git-compat-util.h: use "UNUSED", not "UNUSED(var)"
343
- (this branch uses jk/unused-annotation.)
344
-
345
- Undoes 'jk/unused-annotation' topic and redoes it to work around
346
- Coccinelle rules misfiring false positives in unrelated codepaths.
347
-
348
- Will merge to 'master'.
349
- source: <cover-0.2-00000000000-20220825T170709Z-avarab@gmail.com>
350
-
351
-
382
* ab/coccicheck-incremental (2022-08-31) 9 commits
383
- spatchcache: add a ccache-alike for "spatch"
384
- cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES
@@ -367,18 +397,6 @@ Release tarballs are available at:
397
source: <cover-v2-0.9-00000000000-20220831T205130Z-avarab@gmail.com>
398
399
370
-* en/remerge-diff-fixes (2022-09-02) 3 commits
371
- (merged to 'next' on 2022-09-12 at 9879cec049)
372
- + diff: fix filtering of merge commits under --remerge-diff
373
- + diff: fix filtering of additional headers under --remerge-diff
374
- + diff: have submodule_format logic avoid additional diff headers
375
-
376
- Fix a few "git log --remerge-diff" bugs.
377
-
378
- Will merge to 'master'.
379
- source: <pull.1342.v3.git.1662090810.gitgitgadget@gmail.com>
380
-
381
-
400
* es/chainlint (2022-09-12) 19 commits
401
(merged to 'next' on 2022-09-12 at 577e59143f)
402
+ chainlint: colorize problem annotations and test delimiters
@@ -410,44 +428,43 @@ Release tarballs are available at:
428
429
430
* vd/scalar-to-main (2022-09-02) 9 commits
413
- - Documentation/technical: include Scalar technical doc
414
- - t/perf: add 'GIT_PERF_USE_SCALAR' run option
415
- - t/perf: add Scalar performance tests
416
- - scalar-clone: add test coverage
417
- - scalar: add to 'git help -a' command list
418
- - scalar: implement the `help` subcommand
419
- - git help: special-case `scalar`
420
- - scalar: include in standard Git build & installation
421
- - scalar: fix command documentation section header
431
+ (merged to 'next' on 2022-09-14 at 230bf89c01)
432
+ + Documentation/technical: include Scalar technical doc
433
+ + t/perf: add 'GIT_PERF_USE_SCALAR' run option
434
+ + t/perf: add Scalar performance tests
435
+ + scalar-clone: add test coverage
436
+ + scalar: add to 'git help -a' command list
437
+ + scalar: implement the `help` subcommand
438
+ + git help: special-case `scalar`
439
+ + scalar: include in standard Git build & installation
440
+ + scalar: fix command documentation section header
441
442
Hoist the remainder of "scalar" out of contrib/ to the main part of
443
the codebase.
444
426
- Will merge to 'next'.
445
+ Will merge to 'master'.
446
source: <pull.1341.v2.git.1662134210.gitgitgadget@gmail.com>
447
448
430
-* ad/t1800-cygwin (2022-09-01) 1 commit
431
- - t1800: correct test to handle Cygwin
449
+* ad/t1800-cygwin (2022-09-15) 1 commit
450
+ (merged to 'next' on 2022-09-15 at 9667abb48c)
451
+ + t1800: correct test to handle Cygwin
452
453
Test fix.
454
435
- Expecting a reroll.
436
- cf. <YxFinAJ2NeKiHaS8@danh.dev>
437
- source: <20220901173942.abolcr4aa5gixncm@lucy.dinwoodie.org>
455
+ Will merge to 'master'.
456
+ source: <20220915075717.425673-1-adam@dinwoodie.org>
457
458
440
-* tb/diffstat-with-utf8-strwidth (2022-09-13) 2 commits
441
- - diff.c: More changes and tests around utf8_strwidth()
442
- - diff.c: When appropriate, use utf8_strwidth(), part1
459
+* tb/diffstat-with-utf8-strwidth (2022-09-14) 1 commit
460
+ - diff.c: use utf8_strwidth() to count display width
461
462
"git diff --stat" etc. were invented back when everything was ASCII
463
and strlen() was a way to measure the display width of a string;
464
adjust them to compute the display width assuming UTF-8 pathnames.
465
466
Expecting a reroll.
449
- cf. <20220907043040.idqqivi3jt35jyst@tb-raspi4>
450
- source: <CA+VDVVVmi99i6ZY64tg8RkVXDc5gOzQP_SH12zhDKRkUnhWFgw@mail.gmail.com>
467
+ source: <20220914151333.3309-1-tboegi@web.de>
468
469
470
* gc/submodule-clone-update-with-branches (2022-08-29) 6 commits
@@ -473,18 +490,20 @@ Release tarballs are available at:
490
491
"git grep" learned to work better in a sparse checkout.
492
476
- Will merge to 'next'? Or expecting a final reroll?
493
+ The design of "--sparse" feels iffy.
494
cf. <093827ae-41ef-5f7c-7829-647536ce1305@github.com>
495
+ cf. <CABPp-BF-z72=hY_Jf8h3g95s+wwZOsV_S=+dDNs_AVskQxoaTw@mail.gmail.com>
496
source: <20220908001854.206789-1-shaoxuan.yuan02@gmail.com>
497
498
499
* ds/use-platform-regex-on-macos (2022-08-26) 1 commit
482
- - grep: fix multibyte regex handling under macOS
500
+ (merged to 'next' on 2022-09-14 at 80905596d8)
501
+ + grep: fix multibyte regex handling under macOS
502
503
With a bit of header twiddling, use the native regexp library on
504
macOS instead of the compat/ one.
505
487
- Will merge to and cook in 'next'.
506
+ Will cook in 'next'.
507
cf. <xmqqzgf389k9.fsf@gitster.g>
508
source: <20220826085815.2771102-1-dds@aueb.gr>
509
@@ -524,31 +543,6 @@ Release tarballs are available at:
543
source: <pull.1320.v2.git.1661243463.gitgitgadget@gmail.com>
544
545
527
-* jk/unused-annotation (2022-08-19) 11 commits
528
- (merged to 'next' on 2022-08-24 at 2174b8c75d)
529
- + is_path_owned_by_current_uid(): mark "report" parameter as unused
530
- + run-command: mark unused async callback parameters
531
- + mark unused read_tree_recursive() callback parameters
532
- + hashmap: mark unused callback parameters
533
- + config: mark unused callback parameters
534
- + streaming: mark unused virtual method parameters
535
- + transport: mark bundle transport_options as unused
536
- + refs: mark unused virtual method parameters
537
- + refs: mark unused reflog callback parameters
538
- + refs: mark unused each_ref_fn parameters
539
- + git-compat-util: add UNUSED macro
540
- (this branch is used by ab/unused-annotation.)
541
-
542
- Annotate function parameters that are not used (but cannot be
543
- removed for structural reasons), to prepare us to later compile
544
- with -Wunused warning turned on.
545
-
546
- Will merge to 'master' along with 'ab/unused-annotation' that undoes the whole thing.
547
- cf. <Ywh7ppVFk6VK1Ybs@coredump.intra.peff.net>
548
- cf. <xmqqy1v7r3so.fsf@gitster.g>
549
- source: <Yv9gxqH6nK2KYnNj@coredump.intra.peff.net>
550
-
551
-
546
* pw/rebase-keep-base-fixes (2022-09-07) 7 commits
547
- rebase --keep-base: imply --no-fork-point
548
- rebase --keep-base: imply --reapply-cherry-picks
@@ -617,53 +611,6 @@ Release tarballs are available at:
611
source: <20220909222736.279362-1-shaoxuan.yuan02@gmail.com>
612
613
620
-* ab/dedup-config-and-command-docs (2022-09-07) 9 commits
621
- (merged to 'next' on 2022-09-08 at cd5b217110)
622
- + docs: add CONFIGURATION sections that fuzzy map to built-ins
623
- + docs: add CONFIGURATION sections that map to a built-in
624
- + log docs: de-duplicate configuration sections
625
- + difftool docs: de-duplicate configuration sections
626
- + notes docs: de-duplicate and combine configuration sections
627
- + apply docs: de-duplicate configuration sections
628
- + send-email docs: de-duplicate configuration sections
629
- + grep docs: de-duplicate configuration sections
630
- + docs: add and use include template for config/* includes
631
-
632
- Share the text used to explain configuration variables used by "git
633
- <subcmd>" in "git help <subcmd>" with the text from "git help config".
634
-
635
- Will merge to 'master'.
636
- cf. <CAHd-oW71qvhG16YtMweA26SDCLKn+LHZe13njn18CD==9Ewbnw@mail.gmail.com>
637
- source: <cover-v4-0.9-00000000000-20220907T082419Z-avarab@gmail.com>
638
-
639
-
640
-* ab/submodule-helper-leakfix (2022-09-02) 18 commits
641
- (merged to 'next' on 2022-09-08 at bf21cfed4b)
642
- + submodule--helper: fix a configure_added_submodule() leak
643
- + submodule--helper: free rest of "displaypath" in "struct update_data"
644
- + submodule--helper: free some "displaypath" in "struct update_data"
645
- + submodule--helper: fix a memory leak in print_status()
646
- + submodule--helper: fix a leak in module_add()
647
- + submodule--helper: fix obscure leak in module_add()
648
- + submodule--helper: fix "reference" leak
649
- + submodule--helper: fix a memory leak in get_default_remote_submodule()
650
- + submodule--helper: fix a leak with repo_clear()
651
- + submodule--helper: fix "sm_path" and other "module_cb_list" leaks
652
- + submodule--helper: fix "errmsg_str" memory leak
653
- + submodule--helper: add and use *_release() functions
654
- + submodule--helper: don't leak {run,capture}_command() cp.dir argument
655
- + submodule--helper: "struct pathspec" memory leak in module_update()
656
- + submodule--helper: fix most "struct pathspec" memory leaks
657
- + submodule--helper: fix trivial get_default_remote_submodule() leak
658
- + submodule--helper: fix a leak in "clone_submodule"
659
- + Merge branch 'ab/submodule-helper-prep' into ab/submodule-helper-leakfix
660
-
661
- Plugging leaks in submodule--helper.
662
-
663
- Will merge to 'master'.
664
- source: <cover-v7-00.17-00000000000-20220831T231003Z-avarab@gmail.com>
665
-
666
-
614
* po/glossary-around-traversal (2022-07-09) 3 commits
615
- glossary: add reachability bitmap description
616
- glossary: add commit graph description