What's cooking (2022/09 #01)
Junio C Hamano committed
Sep 5, 2022 at 18:47 UTC
5c7ace1a74174fb862db0517b64de9f224d1fc0d
1 file changed
+392
-456
whats-cooking.txt
+392
-456
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2022, #10; Tue, 30)
3
-X-master-at: d42b38dfb5edf1a7fddd9542d722f91038407819
4
-X-next-at: 179cf4a1993382e88ddca40c073b2b2f5899be0d
2
+Subject: What's cooking in git.git (Sep 2022, #01; Mon, 5)
3
+X-master-at: 79f2338b3746d23454308648b2491e5beba4beff
4
+X-next-at: 6a6ce2da067c0f93245427725e5f14352452ea04
5
6
-What's cooking in git.git (Aug 2022, #10; Tue, 30)
6
+What's cooking in git.git (Sep 2022, #01; Mon, 5)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -13,9 +13,10 @@ 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 in the middle of week #8 in a 12-week cycle toward Git 2.38
17
-(tinyurl.com/gitCal). As we have accumulated enough material on
18
-the 'maint' branch, Git 2.37.3 has been tagged.
16
+We just started week #9 in a 12-week cycle toward Git 2.38
17
+(tinyurl.com/gitCal), but since Monday was a holiday in US, we may
18
+see only four days worth of new patches, which is less work for our
19
+reviewers pool ;-)
20
21
Copies of the source code to Git live in many repositories, and the
22
following is a list of the ones I push into or their mirrors. Some
@@ -48,222 +49,370 @@ Release tarballs are available at:
49
--------------------------------------------------
50
[Graduated to 'master']
51
51
-* ad/preload-plug-memleak (2022-08-22) 1 commit
52
- (merged to 'next' on 2022-08-24 at 1cad371f1c)
53
- + preload-index: fix memleak
52
+* ac/bitmap-lookup-table (2022-08-28) 7 commits
53
+ (merged to 'next' on 2022-08-29 at 05d2d2c8bd)
54
+ + pack-bitmap-write: drop unused pack_idx_entry parameters
55
+ (merged to 'next' on 2022-08-26 at 7914c141eb)
56
+ + bitmap-lookup-table: add performance tests for lookup table
57
+ + pack-bitmap: prepare to read lookup table extension
58
+ + pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests
59
+ + pack-bitmap-write.c: write lookup table extension
60
+ + bitmap: move `get commit positions` code to `bitmap_writer_finish`
61
+ + Documentation/technical: describe bitmap lookup table extension
62
55
- The preload-index codepath made copies of pathspec to give to
56
- multiple threads, which were left leaked.
57
- source: <20220822211507.8693-2-anthony.2lannoy@gmail.com>
63
+ The pack bitmap file gained a bitmap-lookup table to speed up
64
+ locating the necessary bitmap for a given commit.
65
+ source: <pull.1266.v6.git.1660496112.gitgitgadget@gmail.com>
66
67
60
-* ds/decorate-filter-tweak (2022-08-05) 11 commits
61
- (merged to 'next' on 2022-08-19 at 064b9daa85)
62
- + fetch: use ref_namespaces during prefetch
63
- + maintenance: stop writing log.excludeDecoration
64
- + log: create log.initialDecorationSet=all
65
- + log: add --clear-decorations option
66
- + log: add default decoration filter
67
- + log-tree: use ref_namespaces instead of if/else-if
68
- + refs: use ref_namespaces for replace refs base
69
- + refs: add array of ref namespaces
70
- + t4207: test coloring of grafted decorations
71
- + t4207: modernize test
72
- + refs: allow "HEAD" as decoration filter
68
+* bc/gc-crontab-fix (2022-08-28) 1 commit
69
+ (merged to 'next' on 2022-08-30 at a7a240a4da)
70
+ + gc: use temporary file for editing crontab
71
+ (this branch is used by jk/test-crontab-fixes.)
72
+
73
+ FreeBSD portability fix for "git maintenance" that spawns "crontab"
74
+ to schedule tasks.
75
+ source: <20220828214143.754759-1-sandals@crustytoothpaste.net>
76
+
77
+
78
+* ds/bundle-uri-clone (2022-08-24) 6 commits
79
+ (merged to 'next' on 2022-08-25 at 14754922fa)
80
+ + clone: warn on failure to repo_init()
81
+ (merged to 'next' on 2022-08-18 at 5e8a3ec71e)
82
+ + clone: --bundle-uri cannot be combined with --depth
83
+ + bundle-uri: add support for http(s):// and file://
84
+ + clone: add --bundle-uri option
85
+ + bundle-uri: create basic file-copy logic
86
+ + remote-curl: add 'get' capability
87
+ (this branch is used by ds/bundle-uri-3.)
88
74
- The namespaces used by "log --decorate" from "refs/" hierarchy by
75
- default has been tightened.
76
- source: <pull.1301.v3.git.1659722323.gitgitgadget@gmail.com>
89
+ Implement "git clone --bundle-uri".
90
+ source: <pull.1300.v3.git.1660050703.gitgitgadget@gmail.com>
91
+ source: <5229519b-3af2-a023-8996-43343b130722@github.com>
92
93
79
-* ds/github-actions-use-newer-ubuntu (2022-08-24) 1 commit
80
- (merged to 'next' on 2022-08-24 at 55a76348b2)
81
- + ci: update 'static-analysis' to Ubuntu 22.04
94
+* en/merge-multi-strategies (2022-08-24) 2 commits
95
+ (merged to 'next' on 2022-08-25 at 420e2eae66)
96
+ + merge: small code readability improvement
97
+ + merge: cleanup confusing logic for handling successful merges
98
83
- Update the version of Ubuntu used for GitHub Actions CI from 18.04
84
- to 22.04.
85
- source: <pull.1334.git.1661275691795.gitgitgadget@gmail.com>
99
+ The code that implements multi-strategy support in "git merge" has
100
+ been clean-up a bit.
101
+ source: <pull.1331.v2.git.1661222541.gitgitgadget@gmail.com>
102
103
88
-* en/ancestry-path-in-a-range (2022-08-19) 3 commits
89
- (merged to 'next' on 2022-08-19 at 4fce3015b3)
90
- + revision: allow --ancestry-path to take an argument
91
- + t6019: modernize tests with helper
92
- + rev-list-options.txt: fix simple typo
104
+* en/merge-unstash-only-on-clean-merge (2022-08-24) 1 commit
105
+ (merged to 'next' on 2022-08-25 at a144bdf6cb)
106
+ + merge: only apply autostash when appropriate
107
94
- "git rev-list --ancestry-path=C A..B" is a natural extension of
95
- "git rev-list A..B"; instead of choosing a subset of A..B to those
96
- that have ancestry relationship with A, it lets a subset with
97
- ancestry relationship with C.
98
- source: <pull.1303.v3.git.1660883290.gitgitgadget@gmail.com>
108
+ The auto-stashed local changes created by "git merge --autostash"
109
+ was mixed into a conflicted state left in the working tree, which
110
+ has been corrected.
111
+ source: <610b8d089db97bf1a37dbf230f51ecafe3086254.1661222541.git.gitgitgadget@gmail.com>
112
113
101
-* en/ort-unused-code-removal (2022-08-19) 1 commit
102
- (merged to 'next' on 2022-08-22 at f09dbeeca3)
103
- + merge-ort: remove code obsoleted by other changes
114
+* en/t4301-more-merge-tree-tests (2022-08-24) 1 commit
115
+ (merged to 'next' on 2022-08-25 at c7abf60ff4)
116
+ + t4301: add more interesting merge-tree testcases
117
+ (this branch is used by es/t4301-sed-portability-fix.)
118
105
- Code clean-up.
106
- source: <pull.1302.git.git.1660884355643.gitgitgadget@gmail.com>
119
+ More tests to protect the current behaviour of "merge-tree" before
120
+ it gets further updated.
121
+ source: <pull.1332.git.1661237316150.gitgitgadget@gmail.com>
122
+
123
+
124
+* en/test-without-test-create-repo (2022-08-26) 1 commit
125
+ (merged to 'next' on 2022-08-30 at 4f80f48e27)
126
+ + t64xx: convert 'test_create_repo' to 'git init'
127
+
128
+ Test clean-up.
129
+ source: <pull.1303.v2.git.git.1661485759789.gitgitgadget@gmail.com>
130
131
109
-* es/fix-chained-tests (2022-08-24) 4 commits
110
- (merged to 'next' on 2022-08-24 at 6266835a6e)
111
- + t5329: notice a failure within a loop
112
- (merged to 'next' on 2022-08-22 at 3774cfdaf4)
113
- + t: detect and signal failure within loop
114
- + t1092: fix buggy sparse "blame" test
115
- + t2407: fix broken &&-chains in compound statement
132
+* es/t4301-sed-portability-fix (2022-08-29) 4 commits
133
+ (merged to 'next' on 2022-08-30 at eec0ceef0a)
134
+ + t4301: emit blank line in more idiomatic fashion
135
+ + t4301: fix broken &&-chains and add missing loop termination
136
+ + t4301: account for behavior differences between sed implementations
137
+ + Merge branch 'en/t4301-more-merge-tree-tests' into es/t4301-sed-portability-fix
138
+
139
+ Test clean-up.
140
+ source: <pull.1339.git.1661663879.gitgitgadget@gmail.com>
141
+
142
+
143
+* jk/test-crontab-fixes (2022-08-30) 1 commit
144
+ (merged to 'next' on 2022-09-02 at d5113b5be3)
145
+ + test-crontab: minor memory and error handling fixes
146
+ (this branch uses bc/gc-crontab-fix.)
147
+
148
+ Test helper fix.
149
+ source: <20220823010120.25388-1-sandals@crustytoothpaste.net>
150
+
151
+
152
+* rs/tempfile-cleanup-race-fix (2022-08-27) 1 commit
153
+ (merged to 'next' on 2022-08-30 at 158dd1c910)
154
+ + tempfile: avoid directory cleanup race
155
+ (this branch is used by jk/tempfile-active-flag-cleanup.)
156
+
157
+ The clean-up of temporary files created via mks_tempfile_dt() was
158
+ racy and attempted to unlink() the leading directory when signals
159
+ are involved, which has been corrected.
160
+ source: <526a174e-b179-c284-a21c-7afe0a0b4df2@web.de>
161
117
- Fix broken "&&-" chains and failures in early iterations of a loop.
118
- source: <pull.1312.git.git.1661192802.gitgitgadget@gmail.com>
162
163
+* rs/test-mergesort (2022-08-28) 2 commits
164
+ (merged to 'next' on 2022-08-30 at 4905149886)
165
+ + test-mergesort: use mem_pool for sort input
166
+ + test-mergesort: read sort input all at once
167
121
-* jd/prompt-show-conflict (2022-08-19) 1 commit
122
- (merged to 'next' on 2022-08-19 at 83af487823)
123
- + git-prompt: show presence of unresolved conflicts at command prompt
168
+ Optimization of a test-helper command.
169
+ source: <128f0fb8-d29b-8622-0cfe-2ecadc999db5@web.de>
170
125
- The bash prompt (in contrib/) learned to optionally indicate when
126
- the index is unmerged.
127
- source: <pull.1302.v3.git.1660695492382.gitgitgadget@gmail.com>
171
172
+* sg/parse-options-subcommand (2022-08-25) 23 commits
173
+ (merged to 'next' on 2022-08-25 at dab6bf1439)
174
+ + remote: run "remote rm" argv through parse_options()
175
+ + maintenance: add parse-options boilerplate for subcommands
176
+ + pass subcommand "prefix" arguments to parse_options()
177
+ (merged to 'next' on 2022-08-22 at 09d07c2271)
178
+ + builtin/worktree.c: let parse-options parse subcommands
179
+ + builtin/stash.c: let parse-options parse subcommands
180
+ + builtin/sparse-checkout.c: let parse-options parse subcommands
181
+ + builtin/remote.c: let parse-options parse subcommands
182
+ + builtin/reflog.c: let parse-options parse subcommands
183
+ + builtin/notes.c: let parse-options parse subcommands
184
+ + builtin/multi-pack-index.c: let parse-options parse subcommands
185
+ + builtin/hook.c: let parse-options parse subcommands
186
+ + builtin/gc.c: let parse-options parse 'git maintenance's subcommands
187
+ + builtin/commit-graph.c: let parse-options parse subcommands
188
+ + builtin/bundle.c: let parse-options parse subcommands
189
+ + parse-options: add support for parsing subcommands
190
+ + parse-options: drop leading space from '--git-completion-helper' output
191
+ + parse-options: clarify the limitations of PARSE_OPT_NODASH
192
+ + parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options
193
+ + api-parse-options.txt: fix description of OPT_CMDMODE
194
+ + t0040-parse-options: test parse_options() with various 'parse_opt_flags'
195
+ + t5505-remote.sh: check the behavior without a subcommand
196
+ + t3301-notes.sh: check that default operation mode doesn't take arguments
197
+ + git.c: update NO_PARSEOPT markings
198
+ (this branch is used by js/bisect-in-c.)
199
130
-* jk/unused-fixes (2022-08-20) 7 commits
131
- (merged to 'next' on 2022-08-22 at 2fe4de2aed)
132
- + xdiff: drop unused mmfile parameters from xdl_do_patience_diff()
133
- + reflog: assert PARSE_OPT_NONEG in parse-options callbacks
134
- + reftable: drop unused parameter from reader_seek_linear()
135
- + verify_one_sparse(): drop unused parameters
136
- + match_pathname(): drop unused "flags" parameter
137
- + log-tree: drop unused commit param in remerge_diff()
138
- + xdiff: drop unused mmfile parameters from xdl_do_histogram_diff()
200
+ Introduce the "subcommand" mode to parse-options API and update the
201
+ command line parser of Git commands with subcommands.
202
+ source: <20220819160411.1791200-1-szeder.dev@gmail.com>
203
+ source: <YwdSzrF3xaHvLsI+@coredump.intra.peff.net>
204
140
- Code clean-up to remove unused function parameters.
141
- source: <Yv9Oay+tNqhLDqVl@coredump.intra.peff.net>
142
- source: <YwCjOETsh1o8u0Og@coredump.intra.peff.net>
205
206
+* tb/midx-with-changing-preferred-pack-fix (2022-08-22) 7 commits
207
+ (merged to 'next' on 2022-08-26 at 305a9d3323)
208
+ + midx.c: avoid adding preferred objects twice
209
+ + midx.c: include preferred pack correctly with existing MIDX
210
+ + midx.c: extract `midx_fanout_add_pack_fanout()`
211
+ + midx.c: extract `midx_fanout_add_midx_fanout()`
212
+ + midx.c: extract `struct midx_fanout`
213
+ + t/lib-bitmap.sh: avoid silencing stderr
214
+ + t5326: demonstrate potential bitmap corruption
215
145
-* mg/sequencer-untranslate-reflog (2022-08-19) 3 commits
146
- (merged to 'next' on 2022-08-22 at 75aadeb865)
147
- + sequencer: do not translate command names
148
- + sequencer: do not translate parameters to error_resolve_conflict()
149
- + sequencer: do not translate reflog messages
216
+ Multi-pack index got corrupted when preferred pack changed from one
217
+ pack to another in a certain way, which has been corrected.
218
+ source: <cover.1661197803.git.me@ttaylorr.com>
219
151
- The sequencer machinery translated messages left in the reflog by
152
- mistake, which has been corrected.
153
- source: <cover.1660828108.git.git@grubix.eu>
220
221
156
-* mt/rot13-in-c (2022-08-14) 4 commits
157
- (merged to 'next' on 2022-08-19 at 22152a150c)
158
- + tests: use the new C rot13-filter helper to avoid PERL prereq
159
- + t0021: implementation the rot13-filter.pl script in C
160
- + t0021: avoid grepping for a Perl-specific string at filter output
161
- + Merge branch 'mt/checkout-count-fix' into mt/rot13-in-c
222
+--------------------------------------------------
223
+[Stalled]
224
163
- Test portability improvements.
164
- source: <cover.1660522524.git.matheus.bernardino@usp.br>
225
+* es/mark-gc-cruft-as-experimental (2022-08-03) 2 commits
226
+ - config: let feature.experimental imply gc.cruftPacks=true
227
+ - gc: add tests for --cruft and friends
228
229
+ Enable gc.cruftpacks by default for those who opt into
230
+ feature.experimental setting.
231
167
-* sg/xcalloc-cocci-fix (2022-08-24) 1 commit
168
- (merged to 'next' on 2022-08-24 at 84c05819d3)
169
- + promisor-remote: fix xcalloc() argument order
232
+ Expecting a reroll.
233
+ cf. <220804.86a68ke9d5.gmgdl@evledraar.gmail.com>
234
+ cf. <6803b725-526e-a1c8-f15c-a9ed4a144d4c@github.com>
235
+ source: <20220803205721.3686361-1-emilyshaffer@google.com>
236
171
- xcalloc(), imitating calloc(), takes "number of elements of the
172
- array", and "size of a single element", in this order. A call that
173
- does not follow this ordering has been corrected.
174
- source: <20220823095733.58685-1-szeder.dev@gmail.com>
237
238
+* es/doc-creation-factor-fix (2022-07-28) 2 commits
239
+ - range-diff: clarify --creation-factor=<factor>
240
+ - format-patch: clarify --creation-factor=<factor>
241
177
-* tl/trace2-config-scope (2022-08-11) 2 commits
178
- (merged to 'next' on 2022-08-22 at 75a09c7a34)
179
- + tr2: shows scope unconditionally in addition to key-value pair
180
- + api-trace2.txt: print config key-value pair
242
+ Expecting a reroll by somebody more familiar with the logic
243
+ cf. <xmqqo7wfix7p.fsf@gitster.g>
244
+ source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr>
245
182
- Tweak trace2 output about configuration variables.
183
- source: <cover.1660272404.git.dyroneteng@gmail.com>
246
247
+* cw/remote-object-info (2022-08-13) 7 commits
248
+ - SQUASH???
249
+ - cat-file: add remote-object-info to batch-command
250
+ - transport: add client support for object-info
251
+ - serve: advertise object-info feature
252
+ - protocol-caps: initialization bug fix
253
+ - fetch-pack: move fetch initialization
254
+ - fetch-pack: refactor packet writing
255
186
-* vd/fix-perf-tests (2022-08-19) 2 commits
187
- (merged to 'next' on 2022-08-22 at e68356e624)
188
- + p0006: fix 'read-tree' argument ordering
189
- + p0004: fix prereq declaration
256
+ A client component to talk with the object-info endpoint.
257
191
- Rather trivial perf-test code fixes.
192
- source: <pull.1330.git.1660942149.gitgitgadget@gmail.com>
258
+ Expecting a reroll.
259
+ cf. <20220728230210.2952731-1-calvinwan@google.com>
260
+ cf. <CAFySSZDvgwbbHCHfyuaqX3tKsr-GjJ9iihygg6rNNe46Ys7_EA@mail.gmail.com>
261
+ source: <20220728230210.2952731-1-calvinwan@google.com>
262
263
195
-* vd/scalar-enables-fsmonitor (2022-08-18) 8 commits
196
- (merged to 'next' on 2022-08-19 at 1e172e5647)
197
- + scalar: update technical doc roadmap with FSMonitor support
198
- + scalar unregister: stop FSMonitor daemon
199
- + scalar: enable built-in FSMonitor on `register`
200
- + scalar: move config setting logic into its own function
201
- + scalar-delete: do not 'die()' in 'delete_enlistment()'
202
- + scalar-[un]register: clearly indicate source of error
203
- + scalar-unregister: handle error codes greater than 0
204
- + scalar: constrain enlistment search
264
206
- "scalar" now enables built-in fsmonitor on enlisted repositories,
207
- when able.
208
- source: <pull.1324.v3.git.1660858853.gitgitgadget@gmail.com>
265
266
--------------------------------------------------
267
[New Topics]
268
213
-* rs/tempfile-cleanup-race-fix (2022-08-27) 1 commit
214
- (merged to 'next' on 2022-08-30 at 158dd1c910)
215
- + tempfile: avoid directory cleanup race
269
+* ab/unused-annotation (2022-09-01) 2 commits
270
+ - git-compat-util.h: use "deprecated" for UNUSED variables
271
+ - git-compat-util.h: use "UNUSED", not "UNUSED(var)"
272
+ (this branch uses jk/unused-annotation.)
273
217
- The clean-up of temporary files created via mks_tempfile_dt() was
218
- racy and attempted to unlink() the leading directory when signals
219
- are involved, which has been corrected.
274
+ Undoes 'jk/unused-annotation' topic and redoes it to work around
275
+ Coccinelle rules misfiring false positives in unrelated codepaths.
276
221
- Will merge to 'master'.
222
- source: <526a174e-b179-c284-a21c-7afe0a0b4df2@web.de>
277
+ Will merge to 'next'?
278
+ source: <cover-0.2-00000000000-20220825T170709Z-avarab@gmail.com>
279
280
225
-* tb/diffstat-with-utf8-strwidth (2022-08-27) 1 commit
226
- - diff.c: use utf8_strwidth() when appropriate
281
+* ab/coccicheck-incremental (2022-08-31) 9 commits
282
+ - spatchcache: add a ccache-alike for "spatch"
283
+ - cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES
284
+ - cocci: make "coccicheck" rule incremental
285
+ - cocci: split off "--all-includes" from SPATCH_FLAGS
286
+ - cocci: split off include-less "tests" from SPATCH_FLAGS
287
+ - Makefile: split off SPATCH_BATCH_SIZE comment from "cocci" heading
288
+ - Makefile: have "coccicheck" re-run if flags change
289
+ - Makefile: add ability to TAB-complete cocci *.patch rules
290
+ - cocci rules: remove unused "F" metavariable from pending rule
291
228
- "git diff --stat" etc. were invented back when everything was ASCII
229
- and strlen() was a way to measure the display width of a string;
230
- adjust them to compute the display width assuming UTF-8 pathnames.
231
- source: <20220827085007.20030-1-tboegi@web.de>
292
+ source: <cover-v2-0.9-00000000000-20220831T205130Z-avarab@gmail.com>
293
294
234
-* bc/gc-crontab-fix (2022-08-28) 1 commit
235
- (merged to 'next' on 2022-08-30 at a7a240a4da)
236
- + gc: use temporary file for editing crontab
295
+* ab/retire-ppc-sha1 (2022-08-31) 2 commits
296
+ (merged to 'next' on 2022-09-05 at 480da6ef06)
297
+ + Makefile: use $(OBJECTS) instead of $(C_OBJ)
298
+ + Makefile + hash.h: remove PPC_SHA1 implementation
299
238
- FreeBSD portability fix for "git maintenance" that spawns "crontab"
239
- to schedule tasks.
300
+ Remove the assembly version of SHA-1 implementation for PPC.
301
302
Will merge to 'master'.
242
- source: <20220828214143.754759-1-sandals@crustytoothpaste.net>
303
+ source: <cover-v3-0.2-00000000000-20220831T090744Z-avarab@gmail.com>
304
+
305
+
306
+* en/remerge-diff-fixes (2022-09-02) 3 commits
307
+ - diff: fix filtering of merge commits under --remerge-diff
308
+ - diff: fix filtering of additional headers under --remerge-diff
309
+ - diff: have submodule_format logic avoid additional diff headers
310
+
311
+ Fix a few "git log --remerge-diff" bugs.
312
+
313
+ Will probably need to rebase to make it mergeable to 'maint'.
314
+ source: <pull.1342.v3.git.1662090810.gitgitgadget@gmail.com>
315
+
316
+
317
+* es/chainlint (2022-09-01) 18 commits
318
+ - t: retire unused chainlint.sed
319
+ - t/Makefile: teach `make test` and `make prove` to run chainlint.pl
320
+ - test-lib: replace chainlint.sed with chainlint.pl
321
+ - test-lib: retire "lint harder" optimization hack
322
+ - t/chainlint: add more chainlint.pl self-tests
323
+ - chainlint.pl: allow `|| echo` to signal failure upstream of a pipe
324
+ - chainlint.pl: complain about loops lacking explicit failure handling
325
+ - chainlint.pl: don't flag broken &&-chain if failure indicated explicitly
326
+ - chainlint.pl: don't flag broken &&-chain if `$?` handled explicitly
327
+ - chainlint.pl: don't require `&` background command to end with `&&`
328
+ - t/Makefile: apply chainlint.pl to existing self-tests
329
+ - chainlint.pl: don't require `return|exit|continue` to end with `&&`
330
+ - chainlint.pl: validate test scripts in parallel
331
+ - chainlint.pl: add parser to identify test definitions
332
+ - chainlint.pl: add parser to validate tests
333
+ - chainlint.pl: add POSIX shell parser
334
+ - chainlint.pl: add POSIX shell lexical analyzer
335
+ - t: add skeleton chainlint.pl
336
+
337
+ Revamp chainlint script for our tests.
338
+ source: <pull.1322.git.git.1661992197.gitgitgadget@gmail.com>
339
+
340
+
341
+* jk/tempfile-active-flag-cleanup (2022-08-30) 3 commits
342
+ (merged to 'next' on 2022-09-05 at 43ed4656b3)
343
+ + tempfile: update comment describing state transitions
344
+ + tempfile: drop active flag
345
+ + Merge branch 'rs/tempfile-cleanup-race-fix' into jk/tempfile-active-flag-cleanup
346
347
+ Code clean-up.
348
245
-* en/test-without-test-create-repo (2022-08-26) 1 commit
246
- (merged to 'next' on 2022-08-30 at 4f80f48e27)
247
- + t64xx: convert 'test_create_repo' to 'git init'
349
+ Will merge to 'master'.
350
+ source: <Yw5nmNJSm9uzLOKL@coredump.intra.peff.net>
351
249
- Test clean-up.
352
251
- Will merge to 'master'.
252
- source: <pull.1303.v2.git.git.1661485759789.gitgitgadget@gmail.com>
353
+* vd/scalar-to-main (2022-09-02) 9 commits
354
+ - Documentation/technical: include Scalar technical doc
355
+ - t/perf: add 'GIT_PERF_USE_SCALAR' run option
356
+ - t/perf: add Scalar performance tests
357
+ - scalar-clone: add test coverage
358
+ - scalar: add to 'git help -a' command list
359
+ - scalar: implement the `help` subcommand
360
+ - git help: special-case `scalar`
361
+ - scalar: include in standard Git build & installation
362
+ - scalar: fix command documentation section header
363
364
+ Hoist the remainder of "scalar" out of contrib/ to the main part of
365
+ the codebase.
366
+ source: <pull.1341.v2.git.1662134210.gitgitgadget@gmail.com>
367
255
-* es/t4301-sed-portability-fix (2022-08-29) 4 commits
256
- (merged to 'next' on 2022-08-30 at eec0ceef0a)
257
- + t4301: emit blank line in more idiomatic fashion
258
- + t4301: fix broken &&-chains and add missing loop termination
259
- + t4301: account for behavior differences between sed implementations
260
- + Merge branch 'en/t4301-more-merge-tree-tests' into es/t4301-sed-portability-fix
261
- (this branch uses en/t4301-more-merge-tree-tests.)
368
263
- Test clean-up.
369
+* ad/t1800-cygwin (2022-09-01) 1 commit
370
+ - t1800: correct test to handle Cygwin
371
+
372
+ Test fix.
373
+
374
+ Expecting a reroll.
375
+ cf. <YxFinAJ2NeKiHaS8@danh.dev>
376
+ source: <20220901173942.abolcr4aa5gixncm@lucy.dinwoodie.org>
377
+
378
+
379
+* jc/diff-no-index-unleak (2022-09-02) 1 commit
380
+ - diff --no-index: unleak paths[] elements
381
+
382
+ Plug a leak or two in "git diff --no-index".
383
+ source: <xmqqilm579hc.fsf@gitster.g>
384
+
385
+
386
+* ow/rev-parse-parseopt-fix (2022-09-02) 1 commit
387
+ - rev-parse --parseopt: detect missing opt-spec
388
+
389
+ The parser in the script interface to parse-options in "git
390
+ rev-parse" has been updated to diagnose a bogus input correctly.
391
+
392
+ Will merge to 'next'?
393
+ source: <20220902175902.22346-1-oystwa@gmail.com>
394
+
395
+
396
+* vd/sparse-reset-checkout-fixes (2022-09-02) 1 commit
397
+ (merged to 'next' on 2022-09-05 at 8c59ace003)
398
+ + unpack-trees: fix sparse directory recursion check
399
+
400
+ Segfault fix-up to an earlier fix to the topic to teach "git reset"
401
+ and "git checkout" work better in a sparse checkout.
402
403
Will merge to 'master'.
266
- source: <pull.1339.git.1661663879.gitgitgadget@gmail.com>
404
+ source: <pull.1344.git.1662066153644.gitgitgadget@gmail.com>
405
+
406
+--------------------------------------------------
407
+[Cooking]
408
+
409
+* tb/diffstat-with-utf8-strwidth (2022-08-27) 1 commit
410
+ - diff.c: use utf8_strwidth() when appropriate
411
+
412
+ "git diff --stat" etc. were invented back when everything was ASCII
413
+ and strlen() was a way to measure the display width of a string;
414
+ adjust them to compute the display width assuming UTF-8 pathnames.
415
+ source: <20220827085007.20030-1-tboegi@web.de>
416
417
418
* gc/submodule-propagate-branches (2022-08-29) 6 commits
@@ -281,40 +430,35 @@ Release tarballs are available at:
430
source: <pull.1321.git.git.1661806456.gitgitgadget@gmail.com>
431
432
284
-* rs/test-mergesort (2022-08-28) 2 commits
285
- (merged to 'next' on 2022-08-30 at 4905149886)
286
- + test-mergesort: use mem_pool for sort input
287
- + test-mergesort: read sort input all at once
288
-
289
- Optimization of a test-helper command.
290
-
291
- Will merge to 'master'.
292
- source: <128f0fb8-d29b-8622-0cfe-2ecadc999db5@web.de>
293
-
294
-
433
* jc/format-patch-force-in-body-from (2022-08-29) 3 commits
296
- - format-patch: learn format.forceInBodyFrom configuration variable
297
- - format-patch: allow forcing the use of in-body From: header
298
- - pretty: separate out the logic to decide the use of in-body from
434
+ (merged to 'next' on 2022-09-05 at cecaaad60e)
435
+ + format-patch: learn format.forceInBodyFrom configuration variable
436
+ + format-patch: allow forcing the use of in-body From: header
437
+ + pretty: separate out the logic to decide the use of in-body from
438
439
"git format-patch --from=<ident>" can be told to add an in-body
440
"From:" line even for commits that are authored by the given
441
<ident> with "--force-in-body-from"option.
442
304
- Will merge to 'next'?
443
+ Will merge to 'master'.
444
source: <20220829213837.13849-1-gitster@pobox.com>
445
446
308
-* sy/sparse-grep (2022-08-29) 2 commits
447
+* sy/sparse-grep (2022-09-02) 3 commits
448
+ - builtin/grep.c: walking tree instead of expanding index with --sparse
449
- builtin/grep.c: integrate with sparse index
450
- builtin/grep.c: add --sparse option
451
312
- source: <20220829232843.183711-1-shaoxuan.yuan02@gmail.com>
452
+ source: <20220903003623.64750-1-shaoxuan.yuan02@gmail.com>
453
454
455
* cc/doc-trailer-whitespace-rules (2022-08-30) 1 commit
316
- - Documentation: clarify whitespace rules for trailers
456
+ (merged to 'next' on 2022-09-05 at 4c018a3ab7)
457
+ + Documentation: clarify whitespace rules for trailers
458
459
+ Doc update.
460
+
461
+ Will merge to 'master'.
462
source: <20220830105046.324041-1-christian.couder@gmail.com>
463
464
@@ -323,10 +467,11 @@ Release tarballs are available at:
467
- t3701: test the built-in `add -i` regardless of NO_PERL
468
- add -p: avoid ambiguous signed/unsigned comparison
469
470
+ More fixes to "add -p"
471
+
472
+ Will merge to 'next'?
473
source: <pull.1340.git.1661867664.gitgitgadget@gmail.com>
474
328
---------------------------------------------------
329
-[Cooking]
475
476
* ds/use-platform-regex-on-macos (2022-08-26) 1 commit
477
- grep: fix multibyte regex handling under macOS
@@ -347,7 +492,6 @@ Release tarballs are available at:
492
- bundle-uri: create base key-value pair parsing
493
- bundle-uri: create bundle_list struct and helpers
494
- Merge branch 'ds/bundle-uri-clone' into ds/bundle-uri-3
350
- (this branch uses ds/bundle-uri-clone.)
495
496
Define the logical elements of a "bundle list", data structure to
497
store them in-core, format to transfer them, and code to parse
@@ -357,54 +501,18 @@ Release tarballs are available at:
501
source: <pull.1333.git.1661181174.gitgitgadget@gmail.com>
502
503
360
-* en/merge-unstash-only-on-clean-merge (2022-08-24) 1 commit
361
- (merged to 'next' on 2022-08-25 at a144bdf6cb)
362
- + merge: only apply autostash when appropriate
363
-
364
- The auto-stashed local changes created by "git merge --autostash"
365
- was mixed into a conflicted state left in the working tree, which
366
- has been corrected.
367
-
368
- Will merge to 'master'.
369
- source: <610b8d089db97bf1a37dbf230f51ecafe3086254.1661222541.git.gitgitgadget@gmail.com>
370
-
371
-
372
-* en/merge-multi-strategies (2022-08-24) 2 commits
373
- (merged to 'next' on 2022-08-25 at 420e2eae66)
374
- + merge: small code readability improvement
375
- + merge: cleanup confusing logic for handling successful merges
376
-
377
- The code that implements multi-strategy support in "git merge" has
378
- been clean-up a bit.
379
-
380
- Will merge to 'master'.
381
- source: <pull.1331.v2.git.1661222541.gitgitgadget@gmail.com>
382
-
383
-
384
-* en/t4301-more-merge-tree-tests (2022-08-24) 1 commit
385
- (merged to 'next' on 2022-08-25 at c7abf60ff4)
386
- + t4301: add more interesting merge-tree testcases
387
- (this branch is used by es/t4301-sed-portability-fix.)
388
-
389
- More tests to protect the current behaviour of "merge-tree" before
390
- it gets further updated.
391
-
392
- Will merge to 'master'.
393
- source: <pull.1332.git.1661237316150.gitgitgadget@gmail.com>
394
-
395
-
396
-* js/add-p-diff-parsing-fix (2022-08-29) 5 commits
397
- - add -p: ignore dirty submodules
398
- - add -p: handle `diff-so-fancy`'s hunk headers better
399
- - add -p: insert space in colored hunk header as needed
400
- - add -p: gracefully ignore unparseable hunk headers in colored diffs
401
- - t3701: redefine what is "bogus" output of a diff filter
504
+* js/add-p-diff-parsing-fix (2022-09-01) 3 commits
505
+ (merged to 'next' on 2022-09-02 at 1545e0898d)
506
+ + add -p: ignore dirty submodules
507
+ + add -p: gracefully handle unparseable hunk headers in colored diffs
508
+ + add -p: detect more mismatches between plain vs colored diffs
509
510
Those who use diff-so-fancy as the diff-filter noticed a regression
404
- or two in the reimplemented "add -p", which has been corrected.
511
+ or two in the code that parses the diff output in the built-in
512
+ version of "add -p", which has been corrected.
513
406
- Will merge to 'next'?
407
- source: <pull.1336.v3.git.1661785916.gitgitgadget@gmail.com>
514
+ Will merge to 'master'.
515
+ source: <pull.1336.v5.git.1662046939.gitgitgadget@gmail.com>
516
517
518
* js/cmake-updates (2022-08-24) 5 commits
@@ -421,13 +529,14 @@ Release tarballs are available at:
529
530
531
* js/range-diff-with-pathspec (2022-08-26) 3 commits
424
- - range-diff: optionally accept pathspecs
425
- - range-diff: consistently validate the arguments
426
- - range-diff: reorder argument handling
532
+ (merged to 'next' on 2022-09-05 at c027222552)
533
+ + range-diff: optionally accept pathspecs
534
+ + range-diff: consistently validate the arguments
535
+ + range-diff: reorder argument handling
536
537
Allow passing a pathspec to "git range-diff".
538
430
- Will merge to 'next'?
539
+ Will merge to 'master'.
540
source: <pull.1335.v2.git.1661506770.gitgitgadget@gmail.com>
541
542
@@ -444,37 +553,23 @@ Release tarballs are available at:
553
+ refs: mark unused reflog callback parameters
554
+ refs: mark unused each_ref_fn parameters
555
+ git-compat-util: add UNUSED macro
556
+ (this branch is used by ab/unused-annotation.)
557
558
Annotate function parameters that are not used (but cannot be
559
removed for structural reasons), to prepare us to later compile
560
with -Wunused warning turned on.
561
452
- Will revert; coccinelle cannot even parse the annotation correctly.
562
+ Will keep but 'ab/unused-annotation' will undo/redo the whole thing.
563
cf. <Ywh7ppVFk6VK1Ybs@coredump.intra.peff.net>
564
cf. <xmqqy1v7r3so.fsf@gitster.g>
565
source: <Yv9gxqH6nK2KYnNj@coredump.intra.peff.net>
566
567
458
-* tb/midx-with-changing-preferred-pack-fix (2022-08-22) 7 commits
459
- (merged to 'next' on 2022-08-26 at 305a9d3323)
460
- + midx.c: avoid adding preferred objects twice
461
- + midx.c: include preferred pack correctly with existing MIDX
462
- + midx.c: extract `midx_fanout_add_pack_fanout()`
463
- + midx.c: extract `midx_fanout_add_midx_fanout()`
464
- + midx.c: extract `struct midx_fanout`
465
- + t/lib-bitmap.sh: avoid silencing stderr
466
- + t5326: demonstrate potential bitmap corruption
467
-
468
- Multi-pack index got corrupted when preferred pack changed from one
469
- pack to another in a certain way, which has been corrected.
470
-
471
- Will merge to 'master'.
472
- source: <cover.1661197803.git.me@ttaylorr.com>
473
-
474
-
475
-* ed/fsmonitor-on-network-disk (2022-08-24) 3 commits
476
- - Check working directory and Unix domain socket file for compatability
477
- - fsmonitor: macOS: allow fsmonitor to run against network-mounted repos
568
+* ed/fsmonitor-on-network-disk (2022-08-31) 5 commits
569
+ - fsmonitor: normalize FSEvents event paths to the real path
570
+ - fsmonitor: ensure filesystem and unix socket filesystem are compatible
571
+ - fsmonitor: generate unique Unix socket file name in the desired location
572
+ - fsmonitor: add two new config options, allowRemote and socketDir
573
(merged to 'next' on 2022-08-14 at 637d458d9c)
574
+ fsmonitor: option to allow fsmonitor to run against network-mounted repos
575
@@ -484,7 +579,7 @@ Release tarballs are available at:
579
580
Needs review.
581
source: <pull.1317.v3.git.1660242752495.gitgitgadget@gmail.com>
487
- source: <pull.1326.v3.git.1661280941.gitgitgadget@gmail.com>
582
+ source: <pull.1326.v4.git.1661962145.gitgitgadget@gmail.com>
583
584
585
* pw/rebase-keep-base-fixes (2022-08-18) 5 commits
@@ -551,129 +646,55 @@ Release tarballs are available at:
646
source: <20220809120910.2021413-1-shaoxuan.yuan02@gmail.com>
647
648
554
-* es/mark-gc-cruft-as-experimental (2022-08-03) 2 commits
555
- - config: let feature.experimental imply gc.cruftPacks=true
556
- - gc: add tests for --cruft and friends
557
-
558
- Enable gc.cruftpacks by default for those who opt into
559
- feature.experimental setting.
560
-
561
- Expecting a reroll.
562
- cf. <220804.86a68ke9d5.gmgdl@evledraar.gmail.com>
563
- cf. <6803b725-526e-a1c8-f15c-a9ed4a144d4c@github.com>
564
- source: <20220803205721.3686361-1-emilyshaffer@google.com>
565
-
566
-
567
-* sg/parse-options-subcommand (2022-08-25) 23 commits
568
- (merged to 'next' on 2022-08-25 at dab6bf1439)
569
- + remote: run "remote rm" argv through parse_options()
570
- + maintenance: add parse-options boilerplate for subcommands
571
- + pass subcommand "prefix" arguments to parse_options()
572
- (merged to 'next' on 2022-08-22 at 09d07c2271)
573
- + builtin/worktree.c: let parse-options parse subcommands
574
- + builtin/stash.c: let parse-options parse subcommands
575
- + builtin/sparse-checkout.c: let parse-options parse subcommands
576
- + builtin/remote.c: let parse-options parse subcommands
577
- + builtin/reflog.c: let parse-options parse subcommands
578
- + builtin/notes.c: let parse-options parse subcommands
579
- + builtin/multi-pack-index.c: let parse-options parse subcommands
580
- + builtin/hook.c: let parse-options parse subcommands
581
- + builtin/gc.c: let parse-options parse 'git maintenance's subcommands
582
- + builtin/commit-graph.c: let parse-options parse subcommands
583
- + builtin/bundle.c: let parse-options parse subcommands
584
- + parse-options: add support for parsing subcommands
585
- + parse-options: drop leading space from '--git-completion-helper' output
586
- + parse-options: clarify the limitations of PARSE_OPT_NODASH
587
- + parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options
588
- + api-parse-options.txt: fix description of OPT_CMDMODE
589
- + t0040-parse-options: test parse_options() with various 'parse_opt_flags'
590
- + t5505-remote.sh: check the behavior without a subcommand
591
- + t3301-notes.sh: check that default operation mode doesn't take arguments
592
- + git.c: update NO_PARSEOPT markings
593
- (this branch is used by js/bisect-in-c.)
594
-
595
- Introduce the "subcommand" mode to parse-options API and update the
596
- command line parser of Git commands with subcommands.
597
-
598
- Will merge to 'master'.
599
- source: <20220819160411.1791200-1-szeder.dev@gmail.com>
600
- source: <YwdSzrF3xaHvLsI+@coredump.intra.peff.net>
601
-
602
-
603
-* ds/bundle-uri-clone (2022-08-24) 6 commits
604
- (merged to 'next' on 2022-08-25 at 14754922fa)
605
- + clone: warn on failure to repo_init()
606
- (merged to 'next' on 2022-08-18 at 5e8a3ec71e)
607
- + clone: --bundle-uri cannot be combined with --depth
608
- + bundle-uri: add support for http(s):// and file://
609
- + clone: add --bundle-uri option
610
- + bundle-uri: create basic file-copy logic
611
- + remote-curl: add 'get' capability
612
- (this branch is used by ds/bundle-uri-3.)
613
-
614
- Implement "git clone --bundle-uri".
615
-
616
- Will merge to 'master'.
617
- source: <pull.1300.v3.git.1660050703.gitgitgadget@gmail.com>
618
- source: <5229519b-3af2-a023-8996-43343b130722@github.com>
619
-
620
-
621
-* es/doc-creation-factor-fix (2022-07-28) 2 commits
622
- - range-diff: clarify --creation-factor=<factor>
623
- - format-patch: clarify --creation-factor=<factor>
624
-
625
- Expecting a reroll by somebody more familiar with the logic
626
- cf. <xmqqo7wfix7p.fsf@gitster.g>
627
- source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr>
628
-
629
-
630
-* ab/submodule-helper-prep (2022-08-22) 32 commits
631
- - submodule--helper: fix bad config API usage
632
- - submodule--helper: libify even more "die" paths for module_update()
633
- - submodule--helper: libify more "die" paths for module_update()
634
- - submodule--helper: check repo{_submodule,}_init() return values
635
- - submodule--helper: libify "must_die_on_failure" code paths (for die)
636
- - submodule--helper update: don't override 'checkout' exit code
637
- - submodule--helper: libify "must_die_on_failure" code paths
638
- - submodule--helper: libify determine_submodule_update_strategy()
639
- - submodule--helper: don't exit() on failure, return
640
- - submodule--helper: use "code" in run_update_command()
641
- - submodule API: don't handle SM_..{UNSPECIFIED,COMMAND} in to_string()
642
- - submodule--helper: don't call submodule_strategy_to_string() in BUG()
643
- - submodule--helper: add missing braces to "else" arm
644
- - submodule--helper: return "ret", not "1" from update_submodule()
645
- - submodule--helper: rename "int res" to "int ret"
646
- - submodule--helper: don't redundantly check "else if (res)"
647
- - submodule--helper: refactor "errmsg_str" to be a "struct strbuf"
648
- - submodule--helper: add "const" to copy of "update_data"
649
- - submodule--helper: add "const" to passed "module_clone_data"
650
- - submodule--helper: move "sb" in clone_submodule() to its own scope
651
- - submodule--helper: use xstrfmt() in clone_submodule()
652
- - submodule--helper: replace memset() with { 0 }-initialization
653
- - submodule--helper style: add \n\n after variable declarations
654
- - submodule--helper style: don't separate declared variables with \n\n
655
- - submodule--helper: move "resolve-relative-url-test" to a test-tool
656
- - submodule--helper: move "check-name" to a test-tool
657
- - submodule--helper: move "is-active" to a test-tool
658
- - test-tool submodule-config: remove unused "--url" handling
659
- - submodule--helper: remove unused "list" helper
660
- - submodule--helper: remove unused "name" helper
661
- - submodule tests: test for "add <repository> <abs-path>"
662
- - submodule tests: test usage behavior
649
+* ab/submodule-helper-prep (2022-09-02) 33 commits
650
+ (merged to 'next' on 2022-09-05 at b0d1b6ada7)
651
+ + submodule--helper: fix bad config API usage
652
+ + submodule--helper: libify even more "die" paths for module_update()
653
+ + submodule--helper: libify more "die" paths for module_update()
654
+ + submodule--helper: check repo{_submodule,}_init() return values
655
+ + submodule--helper: libify "must_die_on_failure" code paths (for die)
656
+ + submodule--helper update: don't override 'checkout' exit code
657
+ + submodule--helper: libify "must_die_on_failure" code paths
658
+ + submodule--helper: libify determine_submodule_update_strategy()
659
+ + submodule--helper: don't exit() on failure, return
660
+ + submodule--helper: use "code" in run_update_command()
661
+ + submodule API: don't handle SM_..{UNSPECIFIED,COMMAND} in to_string()
662
+ + submodule--helper: don't call submodule_strategy_to_string() in BUG()
663
+ + submodule--helper: add missing braces to "else" arm
664
+ + submodule--helper: return "ret", not "1" from update_submodule()
665
+ + submodule--helper: rename "int res" to "int ret"
666
+ + submodule--helper: don't redundantly check "else if (res)"
667
+ + submodule--helper: refactor "errmsg_str" to be a "struct strbuf"
668
+ + submodule--helper: add "const" to passed "struct update_data"
669
+ + submodule--helper: add "const" to copy of "update_data"
670
+ + submodule--helper: add "const" to passed "module_clone_data"
671
+ + submodule--helper: move "sb" in clone_submodule() to its own scope
672
+ + submodule--helper: use xstrfmt() in clone_submodule()
673
+ + submodule--helper: replace memset() with { 0 }-initialization
674
+ + submodule--helper style: add \n\n after variable declarations
675
+ + submodule--helper style: don't separate declared variables with \n\n
676
+ + submodule--helper: move "resolve-relative-url-test" to a test-tool
677
+ + submodule--helper: move "check-name" to a test-tool
678
+ + submodule--helper: move "is-active" to a test-tool
679
+ + test-tool submodule-config: remove unused "--url" handling
680
+ + submodule--helper: remove unused "list" helper
681
+ + submodule--helper: remove unused "name" helper
682
+ + submodule tests: test for "add <repository> <abs-path>"
683
+ + submodule tests: test usage behavior
684
(this branch is used by ab/submodule-helper-leakfix.)
685
686
Code clean-up of "git submodule--helper".
687
667
- Under review.
668
- source: <cover-v3-00.32-00000000000-20220821T130231Z-avarab@gmail.com>
688
+ Will merge to 'master'.
689
+ source: <cover-v4-00.33-00000000000-20220831T230519Z-avarab@gmail.com>
690
691
671
-* ab/dedup-config-and-command-docs (2022-07-29) 9 commits
692
+* ab/dedup-config-and-command-docs (2022-08-31) 9 commits
693
- docs: add CONFIGURATION sections that fuzzy map to built-ins
694
- docs: add CONFIGURATION sections that map to a built-in
695
- log docs: de-duplicate configuration sections
696
- difftool docs: de-duplicate configuration sections
676
- - notes docs: de-duplicate configuration sections
697
+ - notes docs: de-duplicate and combine configuration sections
698
- apply docs: de-duplicate configuration sections
699
- send-email docs: de-duplicate configuration sections
700
- grep docs: de-duplicate configuration sections
@@ -681,32 +702,10 @@ Release tarballs are available at:
702
703
Share the text used to explain configuration variables used by "git
704
<subcmd>" in "git help <subcmd>" with the text from "git help config".
705
+ source: <cover-v3-0.9-00000000000-20220831T083759Z-avarab@gmail.com>
706
685
- Expecting a reroll.
686
- cf. <CAHd-oW5mD-H1kvuF9VEVb8KjaSkUSUpBH-WAkpCn6_Ci8o888w@mail.gmail.com>
687
- cf. <CAHd-oW7s6Hu24uTjCW9ROBbJkA5+7TCu32a4L_BXVLhcvw5kSw@mail.gmail.com>
688
- cf. <xmqqlesb4lwh.fsf@gitster.g>
689
- source: <cover-v2-0.9-00000000000-20220729T081959Z-avarab@gmail.com>
690
-
691
-
692
-* cw/remote-object-info (2022-08-13) 7 commits
693
- - SQUASH???
694
- - cat-file: add remote-object-info to batch-command
695
- - transport: add client support for object-info
696
- - serve: advertise object-info feature
697
- - protocol-caps: initialization bug fix
698
- - fetch-pack: move fetch initialization
699
- - fetch-pack: refactor packet writing
707
701
- A client component to talk with the object-info endpoint.
702
-
703
- Expecting a reroll.
704
- cf. <20220728230210.2952731-1-calvinwan@google.com>
705
- cf. <CAFySSZDvgwbbHCHfyuaqX3tKsr-GjJ9iihygg6rNNe46Ys7_EA@mail.gmail.com>
706
- source: <20220728230210.2952731-1-calvinwan@google.com>
707
-
708
-
709
-* ab/submodule-helper-leakfix (2022-08-22) 18 commits
708
+* ab/submodule-helper-leakfix (2022-09-02) 18 commits
709
- submodule--helper: fix a configure_added_submodule() leak
710
- submodule--helper: free rest of "displaypath" in "struct update_data"
711
- submodule--helper: free some "displaypath" in "struct update_data"
@@ -729,8 +728,8 @@ Release tarballs are available at:
728
729
Plugging leaks in submodule--helper.
730
732
- Waiting for the "prep" step.
733
- source: <cover-v6-00.17-00000000000-20220821T130415Z-avarab@gmail.com>
731
+ Will merge to 'next'?
732
+ source: <cover-v7-00.17-00000000000-20220831T231003Z-avarab@gmail.com>
733
734
735
* po/glossary-around-traversal (2022-07-09) 3 commits
@@ -746,25 +745,7 @@ Release tarballs are available at:
745
source: <pull.1282.git.1657385781.gitgitgadget@gmail.com>
746
747
749
-* ac/bitmap-lookup-table (2022-08-28) 7 commits
750
- (merged to 'next' on 2022-08-29 at 05d2d2c8bd)
751
- + pack-bitmap-write: drop unused pack_idx_entry parameters
752
- (merged to 'next' on 2022-08-26 at 7914c141eb)
753
- + bitmap-lookup-table: add performance tests for lookup table
754
- + pack-bitmap: prepare to read lookup table extension
755
- + pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests
756
- + pack-bitmap-write.c: write lookup table extension
757
- + bitmap: move `get commit positions` code to `bitmap_writer_finish`
758
- + Documentation/technical: describe bitmap lookup table extension
759
-
760
- The pack bitmap file gained a bitmap-lookup table to speed up
761
- locating the necessary bitmap for a given commit.
762
-
763
- Will merge to 'master'.
764
- source: <pull.1266.v6.git.1660496112.gitgitgadget@gmail.com>
765
-
766
-
767
-* js/bisect-in-c (2022-08-27) 17 commits
748
+* js/bisect-in-c (2022-08-30) 17 commits
749
- bisect: no longer try to clean up left-over `.git/head-name` files
750
- bisect: remove Cogito-related code
751
- Turn `git bisect` into a full built-in
@@ -782,51 +763,6 @@ Release tarballs are available at:
763
- bisect--helper: really retire --bisect-next-check
764
- bisect--helper: retire the --no-log option
765
- Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c
785
- (this branch uses sg/parse-options-subcommand.)
766
767
Final bits of "git bisect.sh" have been rewritten in C.
788
-
789
- Expecting a (hopefully final) reroll.
790
- cf. <20627.86ilolhnnn.gmgdl@evledraar.gmail.com>
791
- source: <pull.1132.v5.git.1661604264.gitgitgadget@gmail.com>
792
-
793
---------------------------------------------------
794
-[Discarded]
795
-
796
-* jt/connected-show-missing-from-which-side (2022-06-10) 1 commit
797
- . fetch,fetch-pack: clarify connectivity check error
798
-
799
- We may find an object missing after a "git fetch" stores the
800
- objects it obtained from the other side, but it is not necessarily
801
- because the remote failed to send necessary objects. Reword the
802
- messages in an attempt to help users explore other possibilities
803
- when they hit this error.
804
-
805
- In stalled state for too long.
806
- Also it seems to break t5326 with sha256.
807
- source: <20220610195247.1177549-1-jonathantanmy@google.com>
808
-
809
-
810
-* js/merge-tree-without-munging-filenames (2022-08-19) 3 commits
811
- . t4301: add a test case involving a rename, type change & modification
812
- . merge-tree: show the original file names in the conflict output
813
- . merge-tree -z: always show the original file name first
814
-
815
- "git merge-tree" output was improved to help "merging without
816
- working tree" usecase better in a few ways.
817
-
818
- Retracted for now.
819
- cf. <9p08998o-n88r-2nno-8703-s99o5qpn9o35@tzk.qr>
820
- source: <pull.1327.git.1660892256.gitgitgadget@gmail.com>
821
-
822
-
823
-* tb/show-ref-count (2022-06-06) 2 commits
824
- . builtin/show-ref.c: limit output with `--count`
825
- . builtin/show-ref.c: rename `found_match` to `matches_nr`
826
-
827
- "git show-ref" learned to stop after emitting N refs with the new
828
- "--count=N" option.
829
-
830
- Retracted for now.
831
- cf. <Ywf1zngpKknCmGYl@nand.local>
832
- source: <cover.1654552560.git.me@ttaylorr.com>
768
+ source: <pull.1132.v6.git.1661885419.gitgitgadget@gmail.com>