What's cooking (2022/09 #03)
Junio C Hamano committed
Sep 13, 2022 at 13:52 UTC
dc474fafc733900d79bd5095038396f61748722a
1 file changed
+217
-255
whats-cooking.txt
+217
-255
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Sep 2022, #02; Fri, 9)
3
-X-master-at: dd3f6c4cae7e3b15ce984dce8593ff7569650e24
4
-X-next-at: 50f0e44ec40b5fab5d618dd26ebd776c47e9af13
2
+Subject: What's cooking in git.git (Sep 2022, #03; Tue, 13)
3
+X-master-at: e188ec3a735ae52a0d0d3c22f9df6b29fa613b1e
4
+X-next-at: b38f19008aff4c52573f00da5d2d3bfd3877fcfc
5
6
-What's cooking in git.git (Sep 2022, #02; Fri, 9)
6
+What's cooking in git.git (Sep 2022, #03; Tue, 13)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -13,11 +13,12 @@ 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
-We are at the end of week #9 in a 12-week cycle toward Git 2.38
17
-(tinyurl.com/gitCal). I plan to tag -rc0 (i.e. preview) on the 15th
18
-or so, but I expect that many folks are busy in Chicago for Git Merge
19
-so let's not make a big fuss about it and instead treat it as just one
20
-of the regular updates to the 'master' branch.
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.
22
23
Copies of the source code to Git live in many repositories, and the
24
following is a list of the ones I push into or their mirrors. Some
@@ -50,120 +51,55 @@ Release tarballs are available at:
51
--------------------------------------------------
52
[Graduated to 'master']
53
53
-* ab/retire-ppc-sha1 (2022-08-31) 2 commits
54
- (merged to 'next' on 2022-09-05 at 480da6ef06)
55
- + Makefile: use $(OBJECTS) instead of $(C_OBJ)
56
- + Makefile + hash.h: remove PPC_SHA1 implementation
57
-
58
- Remove the assembly version of SHA-1 implementation for PPC.
59
- source: <cover-v3-0.2-00000000000-20220831T090744Z-avarab@gmail.com>
60
-
61
-
62
-* cc/doc-trailer-whitespace-rules (2022-08-30) 1 commit
63
- (merged to 'next' on 2022-09-05 at 4c018a3ab7)
64
- + Documentation: clarify whitespace rules for trailers
65
-
66
- Doc update.
67
- source: <20220830105046.324041-1-christian.couder@gmail.com>
68
-
69
-
70
-* jc/format-patch-force-in-body-from (2022-08-29) 3 commits
71
- (merged to 'next' on 2022-09-05 at cecaaad60e)
72
- + format-patch: learn format.forceInBodyFrom configuration variable
73
- + format-patch: allow forcing the use of in-body From: header
74
- + pretty: separate out the logic to decide the use of in-body from
75
-
76
- "git format-patch --from=<ident>" can be told to add an in-body
77
- "From:" line even for commits that are authored by the given
78
- <ident> with "--force-in-body-from"option.
79
- source: <20220829213837.13849-1-gitster@pobox.com>
80
-
81
-
82
-* jk/tempfile-active-flag-cleanup (2022-08-30) 3 commits
83
- (merged to 'next' on 2022-09-05 at 43ed4656b3)
84
- + tempfile: update comment describing state transitions
85
- + tempfile: drop active flag
86
- + Merge branch 'rs/tempfile-cleanup-race-fix' into jk/tempfile-active-flag-cleanup
87
-
88
- Code clean-up.
89
- source: <Yw5nmNJSm9uzLOKL@coredump.intra.peff.net>
90
-
91
-
92
-* js/add-p-diff-parsing-fix (2022-09-01) 3 commits
93
- (merged to 'next' on 2022-09-02 at 1545e0898d)
94
- + add -p: ignore dirty submodules
95
- + add -p: gracefully handle unparseable hunk headers in colored diffs
96
- + add -p: detect more mismatches between plain vs colored diffs
97
-
98
- Those who use diff-so-fancy as the diff-filter noticed a regression
99
- or two in the code that parses the diff output in the built-in
100
- version of "add -p", which has been corrected.
101
- source: <pull.1336.v5.git.1662046939.gitgitgadget@gmail.com>
102
-
103
-
104
-* js/range-diff-with-pathspec (2022-08-26) 3 commits
105
- (merged to 'next' on 2022-09-05 at c027222552)
106
- + range-diff: optionally accept pathspecs
107
- + range-diff: consistently validate the arguments
108
- + range-diff: reorder argument handling
109
-
110
- Allow passing a pathspec to "git range-diff".
111
- source: <pull.1335.v2.git.1661506770.gitgitgadget@gmail.com>
112
-
113
-
114
-* vd/sparse-reset-checkout-fixes (2022-09-02) 1 commit
115
- (merged to 'next' on 2022-09-05 at 8c59ace003)
116
- + unpack-trees: fix sparse directory recursion check
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
118
- Segfault fix-up to an earlier fix to the topic to teach "git reset"
119
- and "git checkout" work better in a sparse checkout.
120
- source: <pull.1344.git.1662066153644.gitgitgadget@gmail.com>
91
+ Code clean-up of "git submodule--helper".
92
+ source: <cover-v4-00.33-00000000000-20220831T230519Z-avarab@gmail.com>
93
122
---------------------------------------------------
123
-[New Topics]
94
125
-* ab/doc-synopsis-and-cmd-usage (2022-09-07) 34 commits
126
- - tests: start asserting that *.txt SYNOPSIS matches -h output
127
- - doc txt & -h consistency: make "worktree" consistent
128
- - worktree: define subcommand -h in terms of command -h
129
- - reflog doc: list real subcommands up-front
130
- - doc txt & -h consistency: make "commit" consistent
131
- - doc txt & -h consistency: make "diff-tree" consistent
132
- - doc txt & -h consistency: use "[<label>...]" for "zero or more"
133
- - doc txt & -h consistency: make "annotate" consistent
134
- - doc txt & -h consistency: make "stash" consistent
135
- - doc txt & -h consistency: add missing options
136
- - doc txt & -h consistency: use "git foo" form, not "git-foo"
137
- - doc txt & -h consistency: make "bundle" consistent
138
- - doc txt & -h consistency: make "read-tree" consistent
139
- - doc txt & -h consistency: make "rerere" consistent
140
- - doc txt & -h consistency: add missing options and labels
141
- - doc txt & -h consistency: make output order consistent
142
- - doc txt & -h consistency: add or fix optional "--" syntax
143
- - doc txt & -h consistency: fix mismatching labels
144
- - t/helper/test-proc-receive.c: use "<options>", not "<options>..."
145
- - doc txt & -h consistency: use "<options>", not "<options>..."
146
- - stash doc SYNOPSIS & -h: correct padding around "[]()"
147
- - doc txt & -h consistency: correct padding around "[]()"
148
- - doc txt & -h consistency: add missing "]" to bugreport "-h"
149
- - doc txt & -h consistency: add "-z" to cat-file "-h"
150
- - doc txt & -h consistency: fix incorrect alternates syntax
151
- - doc txt & -h consistency: word-wrap
152
- - built-ins: consistently add "\n" between "usage" and options
153
- - doc SYNOPSIS & -h: fix incorrect alternates syntax
154
- - doc SYNOPSIS: consistently use ' for commands
155
- - doc SYNOPSIS: don't use ' for subcommands
156
- - blame: use a more detailed usage_msg_optf() error on bad -L
157
- - bundle: define subcommand -h in terms of command -h
158
- - builtin/bundle.c: use \t, not fix indentation 2-SP indentation
159
- - CodingGuidelines: update and clarify command-line conventions
160
-
161
- The short-help text shown by "git cmd -h" and the synopsis text
162
- shown at the beginning of "git help cmd" have been made more
163
- consistent.
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
165
- Needs review.
166
- source: <cover-00.34-00000000000-20220902T092734Z-avarab@gmail.com>
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
@@ -174,8 +110,6 @@ Release tarballs are available at:
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.
177
-
178
- Will merge to 'master'.
113
source: <Yxe0k++LA/UfFLF/@coredump.intra.peff.net>
114
115
@@ -189,12 +123,29 @@ Release tarballs are available at:
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.
192
-
193
- Will merge to 'master'.
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
@@ -206,8 +157,6 @@ Release tarballs are available at:
157
input files rather haphazardly, sometimes leaking them. The
158
command line argument processing has been straightened out to clean
159
it up.
209
-
210
- Will merge to 'master'.
160
source: <xmqq8rmx1saz.fsf@gitster.g>
161
162
@@ -220,46 +169,44 @@ Release tarballs are available at:
169
+ t0040-parse-options: remove leftover debugging
170
171
The codepath for the OPT_SUBCOMMAND facility has been cleaned up.
223
-
224
- Will merge to 'master'.
172
source: <20220905185007.9042-1-szeder.dev@gmail.com>
173
174
+--------------------------------------------------
175
+[New Topics]
176
228
-* jk/plug-list-object-filter-leaks (2022-09-08) 5 commits
229
- (merged to 'next' on 2022-09-08 at a6b4b080e4)
230
- + prepare_repo_settings(): plug leak of config values
231
- + list_objects_filter_options: plug leak of filter_spec strings
232
- + transport: free filter options in disconnect_git()
233
- + transport: deep-copy object-filter struct for fetch-pack
234
- + list_objects_filter_copy(): deep-copy sparse_oid_name field
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.)
185
236
- The code that manages list-object-filter structure, used in partial
237
- clones, leaked the instances, which has been plugged.
186
+ A couple of bugfixes with code clean-up.
187
188
Will merge to 'master'.
240
- source: <Yxl1BNQoy6Drf0Oe@coredump.intra.peff.net>
189
+ source: <Yx1qwlpNbxGEiUgc@coredump.intra.peff.net>
190
191
243
-* jk/proto-v2-ref-prefix-fix (2022-09-08) 2 commits
244
- - fetch: add branch.*.merge to default ref-prefix extension
245
- - fetch: stop checking for NULL transport->remote in do_fetch()
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
195
247
- "git fetch" over protocol v2 sent an incorrect ref prefix request
248
- to the server and made "git pull" with configured fetch refspec
249
- that does not cover the remote branch to merge with fail, which has
250
- been corrected.
196
+ Typofix in the UI of a topic that has graduated to 'master'.
197
252
- Will merge to 'next'.
253
- source: <YxpBMaIckimFJYEi@coredump.intra.peff.net>
198
+ Will merge to 'master'.
199
+ source: <pull.1350.git.1662904997760.gitgitgadget@gmail.com>
200
201
256
-* vd/doc-reviewing-guidelines (2022-09-09) 1 commit
257
- - Documentation: add ReviewingGuidelines
202
+* js/typofix (2022-09-12) 1 commit
203
+ (merged to 'next' on 2022-09-12 at 76d57e004b)
204
+ + Documentation: fix various repeat word typos
205
259
- Just like we have coding guidelines, we now have guidelines for
260
- reviewers.
206
+ Typofix.
207
262
- source: <pull.1348.git.1662747205235.gitgitgadget@gmail.com>
208
+ Will merge to 'master'.
209
+ source: <20220911102320.39954-2-jacob@initialcommit.io>
210
211
--------------------------------------------------
212
[Stalled]
@@ -305,6 +252,90 @@ Release tarballs are available at:
252
--------------------------------------------------
253
[Cooking]
254
255
+* ab/doc-synopsis-and-cmd-usage (2022-09-07) 34 commits
256
+ - tests: start asserting that *.txt SYNOPSIS matches -h output
257
+ - doc txt & -h consistency: make "worktree" consistent
258
+ - worktree: define subcommand -h in terms of command -h
259
+ - reflog doc: list real subcommands up-front
260
+ - doc txt & -h consistency: make "commit" consistent
261
+ - doc txt & -h consistency: make "diff-tree" consistent
262
+ - doc txt & -h consistency: use "[<label>...]" for "zero or more"
263
+ - doc txt & -h consistency: make "annotate" consistent
264
+ - doc txt & -h consistency: make "stash" consistent
265
+ - doc txt & -h consistency: add missing options
266
+ - doc txt & -h consistency: use "git foo" form, not "git-foo"
267
+ - doc txt & -h consistency: make "bundle" consistent
268
+ - doc txt & -h consistency: make "read-tree" consistent
269
+ - doc txt & -h consistency: make "rerere" consistent
270
+ - doc txt & -h consistency: add missing options and labels
271
+ - doc txt & -h consistency: make output order consistent
272
+ - doc txt & -h consistency: add or fix optional "--" syntax
273
+ - doc txt & -h consistency: fix mismatching labels
274
+ - t/helper/test-proc-receive.c: use "<options>", not "<options>..."
275
+ - doc txt & -h consistency: use "<options>", not "<options>..."
276
+ - stash doc SYNOPSIS & -h: correct padding around "[]()"
277
+ - doc txt & -h consistency: correct padding around "[]()"
278
+ - doc txt & -h consistency: add missing "]" to bugreport "-h"
279
+ - doc txt & -h consistency: add "-z" to cat-file "-h"
280
+ - doc txt & -h consistency: fix incorrect alternates syntax
281
+ - doc txt & -h consistency: word-wrap
282
+ - built-ins: consistently add "\n" between "usage" and options
283
+ - doc SYNOPSIS & -h: fix incorrect alternates syntax
284
+ - doc SYNOPSIS: consistently use ' for commands
285
+ - doc SYNOPSIS: don't use ' for subcommands
286
+ - blame: use a more detailed usage_msg_optf() error on bad -L
287
+ - bundle: define subcommand -h in terms of command -h
288
+ - builtin/bundle.c: use \t, not fix indentation 2-SP indentation
289
+ - CodingGuidelines: update and clarify command-line conventions
290
+
291
+ The short-help text shown by "git cmd -h" and the synopsis text
292
+ shown at the beginning of "git help cmd" have been made more
293
+ consistent.
294
+
295
+ Needs review.
296
+ source: <cover-00.34-00000000000-20220902T092734Z-avarab@gmail.com>
297
+
298
+
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
+
329
+* vd/doc-reviewing-guidelines (2022-09-09) 1 commit
330
+ - Documentation: add ReviewingGuidelines
331
+
332
+ Just like we have coding guidelines, we now have guidelines for
333
+ reviewers.
334
+
335
+ Needs review.
336
+ source: <pull.1348.git.1662747205235.gitgitgadget@gmail.com>
337
+
338
+
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
@@ -337,17 +368,20 @@ Release tarballs are available at:
368
369
370
* en/remerge-diff-fixes (2022-09-02) 3 commits
340
- - diff: fix filtering of merge commits under --remerge-diff
341
- - diff: fix filtering of additional headers under --remerge-diff
342
- - diff: have submodule_format logic avoid additional diff headers
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
346
- Will probably need to rebase to make it mergeable to 'maint'.
378
+ Will merge to 'master'.
379
source: <pull.1342.v3.git.1662090810.gitgitgadget@gmail.com>
380
381
350
-* es/chainlint (2022-09-01) 18 commits
382
+* es/chainlint (2022-09-12) 19 commits
383
+ (merged to 'next' on 2022-09-12 at 577e59143f)
384
+ + chainlint: colorize problem annotations and test delimiters
385
(merged to 'next' on 2022-09-08 at eab3357b05)
386
+ t: retire unused chainlint.sed
387
+ t/Makefile: teach `make test` and `make prove` to run chainlint.pl
@@ -372,6 +406,7 @@ Release tarballs are available at:
406
407
Will merge to 'master'.
408
source: <pull.1322.git.git.1661992197.gitgitgadget@gmail.com>
409
+ source: <pull.1324.git.git.1663023888412.gitgitgadget@gmail.com>
410
411
412
* vd/scalar-to-main (2022-09-02) 9 commits
@@ -388,7 +423,7 @@ Release tarballs are available at:
423
Hoist the remainder of "scalar" out of contrib/ to the main part of
424
the codebase.
425
391
- Needs review.
426
+ Will merge to 'next'.
427
source: <pull.1341.v2.git.1662134210.gitgitgadget@gmail.com>
428
429
@@ -402,24 +437,17 @@ Release tarballs are available at:
437
source: <20220901173942.abolcr4aa5gixncm@lucy.dinwoodie.org>
438
439
405
-* ow/rev-parse-parseopt-fix (2022-09-08) 1 commit
406
- (merged to 'next' on 2022-09-08 at a15efb3478)
407
- + rev-parse --parseopt: detect missing opt-spec
408
-
409
- The parser in the script interface to parse-options in "git
410
- rev-parse" has been updated to diagnose a bogus input correctly.
411
-
412
- Will merge to 'master'.
413
- source: <20220902175902.22346-1-oystwa@gmail.com>
414
-
415
-
416
-* tb/diffstat-with-utf8-strwidth (2022-08-27) 1 commit
417
- - diff.c: use utf8_strwidth() when appropriate
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
443
444
"git diff --stat" etc. were invented back when everything was ASCII
445
and strlen() was a way to measure the display width of a string;
446
adjust them to compute the display width assuming UTF-8 pathnames.
422
- source: <20220827085007.20030-1-tboegi@web.de>
447
+
448
+ Expecting a reroll.
449
+ cf. <20220907043040.idqqivi3jt35jyst@tb-raspi4>
450
+ source: <CA+VDVVVmi99i6ZY64tg8RkVXDc5gOzQP_SH12zhDKRkUnhWFgw@mail.gmail.com>
451
452
453
* gc/submodule-clone-update-with-branches (2022-08-29) 6 commits
@@ -433,7 +461,8 @@ Release tarballs are available at:
461
"git clone --recurse-submodules" and "git submodule update" learns
462
to honor the "propagete branches" option.
463
436
- Needs review.
464
+ Expecting a reroll.
465
+ cf. <20220901200047.515294-1-jonathantanmy@google.com> and others
466
source: <pull.1321.git.git.1661806456.gitgitgadget@gmail.com>
467
468
@@ -444,29 +473,19 @@ Release tarballs are available at:
473
474
"git grep" learned to work better in a sparse checkout.
475
447
- Needs review.
476
+ Will merge to 'next'? Or expecting a final reroll?
477
+ cf. <093827ae-41ef-5f7c-7829-647536ce1305@github.com>
478
source: <20220908001854.206789-1-shaoxuan.yuan02@gmail.com>
479
480
451
-* js/builtin-add-p-portability-fix (2022-08-30) 3 commits
452
- (merged to 'next' on 2022-09-08 at 8d3e72e890)
453
- + t6132(NO_PERL): do not run the scripted `add -p`
454
- + t3701: test the built-in `add -i` regardless of NO_PERL
455
- + add -p: avoid ambiguous signed/unsigned comparison
456
-
457
- More fixes to "add -p"
458
-
459
- Will merge to 'master'.
460
- source: <pull.1340.git.1661867664.gitgitgadget@gmail.com>
461
-
462
-
481
* ds/use-platform-regex-on-macos (2022-08-26) 1 commit
482
- grep: fix multibyte regex handling under macOS
483
484
With a bit of header twiddling, use the native regexp library on
485
macOS instead of the compat/ one.
486
469
- Needs review.
487
+ Will merge to and cook in 'next'.
488
+ cf. <xmqqzgf389k9.fsf@gitster.g>
489
source: <20220826085815.2771102-1-dds@aueb.gr>
490
491
@@ -499,8 +518,9 @@ Release tarballs are available at:
518
519
Update to build procedure with VS using CMake/CTest.
520
502
- Needs review.
521
+ Expecting a reroll.
522
cf. <3df77ffd-85a2-3a54-9005-34a24ec6e82d@github.com>
523
+ cf. <531620e1-de4c-74aa-c840-c12ce81f8740@github.com> and others
524
source: <pull.1320.v2.git.1661243463.gitgitgadget@gmail.com>
525
526
@@ -529,23 +549,6 @@ Release tarballs are available at:
549
source: <Yv9gxqH6nK2KYnNj@coredump.intra.peff.net>
550
551
532
-* ed/fsmonitor-on-network-disk (2022-08-31) 5 commits
533
- - fsmonitor: normalize FSEvents event paths to the real path
534
- - fsmonitor: ensure filesystem and unix socket filesystem are compatible
535
- - fsmonitor: generate unique Unix socket file name in the desired location
536
- - fsmonitor: add two new config options, allowRemote and socketDir
537
- (merged to 'next' on 2022-08-14 at 637d458d9c)
538
- + fsmonitor: option to allow fsmonitor to run against network-mounted repos
539
-
540
- The built-in fsmonitor refuses to work on a network mounted
541
- repositories; a configuration knob for users to override this has
542
- been introduced.
543
-
544
- Needs review.
545
- source: <pull.1317.v3.git.1660242752495.gitgitgadget@gmail.com>
546
- source: <pull.1326.v4.git.1661962145.gitgitgadget@gmail.com>
547
-
548
-
552
* pw/rebase-keep-base-fixes (2022-09-07) 7 commits
553
- rebase --keep-base: imply --no-fork-point
554
- rebase --keep-base: imply --reapply-cherry-picks
@@ -562,8 +565,8 @@ Release tarballs are available at:
565
option now implies --reapply-cherry-picks and --no-fork-point
566
options.
567
565
- Overall looking good, with some iffy bits.
566
- cf. <xmqqzgfbuk95.fsf@gitster.g>
568
+ Expecting a reroll.
569
+ cf. <e25127f3-6135-b716-a12f-5dbe4f40dc42@gmail.com>
570
source: <pull.1323.v2.git.1662561470.gitgitgadget@gmail.com>
571
572
@@ -591,8 +594,9 @@ Release tarballs are available at:
594
source: <20220809185429.20098-1-alban.gruin@gmail.com>
595
596
594
-* sy/mv-out-of-cone (2022-09-08) 10 commits
595
- - builtin/mv.c: fix possible segfault in add_slash()
597
+* sy/mv-out-of-cone (2022-09-09) 10 commits
598
+ (merged to 'next' on 2022-09-12 at 7cb7b41779)
599
+ + builtin/mv.c: fix possible segfault in add_slash()
600
(merged to 'next' on 2022-08-17 at 2316d9ce4d)
601
+ mv: check overwrite for in-to-out move
602
+ advice.h: add advise_on_moving_dirty_path()
@@ -608,52 +612,9 @@ Release tarballs are available at:
612
move a path from a directory that is "in cone" to another directory
613
that is "out of cone". Handling of such a case has been improved.
614
611
- Will merge to 'next'.
612
- source: <20220809120910.2021413-1-shaoxuan.yuan02@gmail.com>
613
- source: <20220908230223.239970-1-shaoxuan.yuan02@gmail.com>
614
-
615
-
616
-* ab/submodule-helper-prep (2022-09-02) 33 commits
617
- (merged to 'next' on 2022-09-05 at b0d1b6ada7)
618
- + submodule--helper: fix bad config API usage
619
- + submodule--helper: libify even more "die" paths for module_update()
620
- + submodule--helper: libify more "die" paths for module_update()
621
- + submodule--helper: check repo{_submodule,}_init() return values
622
- + submodule--helper: libify "must_die_on_failure" code paths (for die)
623
- + submodule--helper update: don't override 'checkout' exit code
624
- + submodule--helper: libify "must_die_on_failure" code paths
625
- + submodule--helper: libify determine_submodule_update_strategy()
626
- + submodule--helper: don't exit() on failure, return
627
- + submodule--helper: use "code" in run_update_command()
628
- + submodule API: don't handle SM_..{UNSPECIFIED,COMMAND} in to_string()
629
- + submodule--helper: don't call submodule_strategy_to_string() in BUG()
630
- + submodule--helper: add missing braces to "else" arm
631
- + submodule--helper: return "ret", not "1" from update_submodule()
632
- + submodule--helper: rename "int res" to "int ret"
633
- + submodule--helper: don't redundantly check "else if (res)"
634
- + submodule--helper: refactor "errmsg_str" to be a "struct strbuf"
635
- + submodule--helper: add "const" to passed "struct update_data"
636
- + submodule--helper: add "const" to copy of "update_data"
637
- + submodule--helper: add "const" to passed "module_clone_data"
638
- + submodule--helper: move "sb" in clone_submodule() to its own scope
639
- + submodule--helper: use xstrfmt() in clone_submodule()
640
- + submodule--helper: replace memset() with { 0 }-initialization
641
- + submodule--helper style: add \n\n after variable declarations
642
- + submodule--helper style: don't separate declared variables with \n\n
643
- + submodule--helper: move "resolve-relative-url-test" to a test-tool
644
- + submodule--helper: move "check-name" to a test-tool
645
- + submodule--helper: move "is-active" to a test-tool
646
- + test-tool submodule-config: remove unused "--url" handling
647
- + submodule--helper: remove unused "list" helper
648
- + submodule--helper: remove unused "name" helper
649
- + submodule tests: test for "add <repository> <abs-path>"
650
- + submodule tests: test usage behavior
651
- (this branch is used by ab/submodule-helper-leakfix.)
652
-
653
- Code clean-up of "git submodule--helper".
654
-
615
Will merge to 'master'.
656
- source: <cover-v4-00.33-00000000000-20220831T230519Z-avarab@gmail.com>
616
+ source: <20220809120910.2021413-1-shaoxuan.yuan02@gmail.com>
617
+ source: <20220909222736.279362-1-shaoxuan.yuan02@gmail.com>
618
619
620
* ab/dedup-config-and-command-docs (2022-09-07) 9 commits
@@ -696,7 +657,6 @@ Release tarballs are available at:
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
699
- (this branch uses ab/submodule-helper-prep.)
660
661
Plugging leaks in submodule--helper.
662
@@ -737,6 +697,9 @@ Release tarballs are available at:
697
- Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c
698
699
Final bits of "git bisect.sh" have been rewritten in C.
700
+
701
+ Needs review.
702
+ cf. <xmqqv8pr8903.fsf@gitster.g>
703
source: <pull.1132.v6.git.1661885419.gitgitgadget@gmail.com>
704
705
--------------------------------------------------
@@ -753,7 +716,6 @@ Release tarballs are available at:
716
717
* jc/diff-no-index-two-stdin (2022-09-07) 1 commit
718
. diff: "--no-index - -" compares the same standard input
756
- (this branch uses rs/diff-no-index-cleanup.)
719
720
"git diff --no-index - -" learned to optimize the comparison of the
721
same thing obtained from the standard input.