What's cooking (2022/10 #03)
Junio C Hamano committed
Oct 10, 2022 at 14:31 UTC
72b3189970b5c54f963efabfe2b56e680ec758ac
1 file changed
+538
-453
whats-cooking.txt
+538
-453
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2022, #02; Thu, 6)
3
-X-master-at: 3dcec76d9df911ed8321007b1d197c1a206dc164
4
-X-next-at: 74048e4d9e2b6a27a4fab355a907e0c38d172bfd
2
+Subject: What's cooking in git.git (Oct 2022, #03; Mon, 10)
3
+X-master-at: e85701b4af5b7c2a9f3a1b07858703318dce365d
4
+X-next-at: e2ab570f502f4a79dcd18c809dbed1581c00e4e5
5
6
-What's cooking in git.git (Oct 2022, #02; Thu, 6)
6
+What's cooking in git.git (Oct 2022, #03; Mon, 10)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -13,10 +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
-It seems that there aren't many regressions we need to fix
17
-immediately in the most recent release, so let's start merging some
18
-topics that have already been cooking in 'next' down to 'master' and
19
-also some topics that were kept in 'seen' down to 'next' soonish.
16
+Some topics have been expecting updates for too long. Before, or
17
+soon after, rewinding the 'next' branch and opening the floodgates
18
+for this cycle, we may want to discard them, unless they see some
19
+activities.
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
@@ -46,136 +46,449 @@ Release tarballs are available at:
46
47
https://www.kernel.org/pub/software/scm/git/
48
49
+--------------------------------------------------
50
+[Graduated to 'master']
51
+
52
+* ab/test-malloc-with-sanitize-leak (2022-09-29) 1 commit
53
+ (merged to 'next' on 2022-09-29 at b6fef2dd1f)
54
+ + test-lib: have SANITIZE=leak imply TEST_NO_MALLOC_CHECK
55
+
56
+ Test fix.
57
+ source: <patch-1.1-e31681731b7-20220928T095041Z-avarab@gmail.com>
58
+
59
+
60
+* ac/fuzzers (2022-09-19) 1 commit
61
+ (merged to 'next' on 2022-09-29 at 600f45a53b)
62
+ + fuzz: reorganise the path for existing oss-fuzz fuzzers
63
+
64
+ Source file shuffling.
65
+ source: <pull.1353.v4.git.1663598215154.gitgitgadget@gmail.com>
66
+
67
+
68
+* ah/branch-autosetupmerge-grammofix (2022-09-28) 1 commit
69
+ (merged to 'next' on 2022-09-29 at 622b75f0da)
70
+ + push: improve grammar of branch.autoSetupMerge advice
71
+
72
+ Fix grammar of a message introduced in previous round.
73
+ source: <20220928055811.777227-1-alexhenrie24@gmail.com>
74
+
75
+
76
+* ah/fsmonitor-daemon-usage-non-l10n (2022-09-21) 1 commit
77
+ (merged to 'next' on 2022-09-21 at bc69a73c6c)
78
+ + fsmonitor--daemon: don't translate literal commands
79
+
80
+ Fix messages incorrectly marked for translation.
81
+ source: <20220920050709.326359-1-alexhenrie24@gmail.com>
82
+
83
+
84
+* dd/retire-efgrep (2022-09-21) 4 commits
85
+ (merged to 'next' on 2022-09-21 at 22bc339be1)
86
+ + t: convert fgrep usage to "grep -F"
87
+ + t: convert egrep usage to "grep -E"
88
+ + t: remove \{m,n\} from BRE grep usage
89
+ + CodingGuidelines: allow grep -E
90
+ (this branch is used by es/retire-efgrep.)
91
+
92
+ Prepare for GNU [ef]grep that throw warning of their uses.
93
+ source: <cover.1663765176.git.congdanhqx@gmail.com>
94
+
95
+
96
+* ds/scalar-unregister-idempotent (2022-09-27) 4 commits
97
+ (merged to 'next' on 2022-09-28 at a09a78d861)
98
+ + string-list: document iterator behavior on NULL input
99
+ + gc: replace config subprocesses with API calls
100
+ + scalar: make 'unregister' idempotent
101
+ + maintenance: add 'unregister --force'
102
+
103
+ "scalar unregister" in a repository that is already been
104
+ unregistered reported an error.
105
+ source: <pull.1358.v4.git.1664287021.gitgitgadget@gmail.com>
106
+
107
+
108
+* ds/use-platform-regex-on-macos (2022-08-26) 1 commit
109
+ (merged to 'next' on 2022-09-14 at 80905596d8)
110
+ + grep: fix multibyte regex handling under macOS
111
+
112
+ With a bit of header twiddling, use the native regexp library on
113
+ macOS instead of the compat/ one.
114
+ source: <20220826085815.2771102-1-dds@aueb.gr>
115
+
116
+
117
+* es/retire-efgrep (2022-09-23) 2 commits
118
+ (merged to 'next' on 2022-09-27 at 344fdd138e)
119
+ + check-non-portable-shell: detect obsolescent egrep/fgrep
120
+ + Merge branch 'dd/retire-efgrep' into es/retire-efgrep
121
+ (this branch uses dd/retire-efgrep.)
122
+
123
+ Prepare for GNU [ef]grep that throw warning of their uses.
124
+ source: <pull.1338.git.git.1663805905554.gitgitgadget@gmail.com>
125
+
126
+
127
+* hn/parse-worktree-ref (2022-09-19) 1 commit
128
+ (merged to 'next' on 2022-09-29 at 1f4453eb83)
129
+ + refs: unify parse_worktree_ref() and ref_type()
130
+
131
+ Code and semantics cleaning.
132
+ source: <pull.1325.v2.git.git.1663605291172.gitgitgadget@gmail.com>
133
+
134
+
135
+* ja/rebase-i-avoid-amending-self (2022-09-26) 1 commit
136
+ (merged to 'next' on 2022-09-29 at 2635f37dae)
137
+ + sequencer: avoid dropping fixup commit that targets self via commit-ish
138
+
139
+ "git rebase -i" can mistakenly attempt to apply a fixup to a commit
140
+ itself, which has been corrected.
141
+ source: <20220924222904.1784975-1-aclopte@gmail.com>
142
+
143
+
144
+* jc/environ-docs (2022-09-16) 5 commits
145
+ (merged to 'next' on 2022-09-29 at a0a43b8de5)
146
+ + environ: GIT_INDEX_VERSION affects not just a new repository
147
+ + environ: simplify description of GIT_INDEX_FILE
148
+ + environ: GIT_FLUSH should be made a usual Boolean
149
+ + environ: explain Boolean environment variables
150
+ + environ: document GIT_SSL_NO_VERIFY
151
+
152
+ Documentation on various Boolean GIT_* environment variables have
153
+ been clarified.
154
+ source: <20220915160659.126441-1-gitster@pobox.com>
155
+
156
+
157
+* jk/clone-allow-bare-and-o-together (2022-09-22) 1 commit
158
+ (merged to 'next' on 2022-09-27 at 1feca721ac)
159
+ + clone: allow "--bare" with "-o"
160
+
161
+ "git clone" did not like to see the "--bare" and the "--origin"
162
+ options used together without a good reason.
163
+ source: <YyvzVdfQVdysvMp2@coredump.intra.peff.net>
164
+
165
+
166
+* jk/fsck-on-diet (2022-09-22) 3 commits
167
+ (merged to 'next' on 2022-09-27 at c2e93082a1)
168
+ + parse_object_buffer(): respect save_commit_buffer
169
+ + fsck: turn off save_commit_buffer
170
+ + fsck: free tree buffers after walking unreachable objects
171
+
172
+ "git fsck" failed to release contents of tree objects already used
173
+ from the memory, which has been fixed.
174
+ source: <Yyw0PSVe3YTQGgRS@coredump.intra.peff.net>
175
+
176
+
177
+* jk/remote-rename-without-fetch-refspec (2022-09-22) 1 commit
178
+ (merged to 'next' on 2022-09-27 at 165fe0a832)
179
+ + remote: handle rename of remote without fetch refspec
180
+
181
+ "git remote rename" failed to rename a remote without fetch
182
+ refspec, which has been corrected.
183
+ source: <YyvzqZ5tmI0UdRAW@coredump.intra.peff.net>
184
+
185
+
186
+* js/merge-ort-in-read-only-repo (2022-09-28) 2 commits
187
+ (merged to 'next' on 2022-09-29 at 84df46c1b4)
188
+ + merge-ort: return early when failing to write a blob
189
+ + merge-ort: fix segmentation fault in read-only repositories
190
+
191
+ In read-only repositories, "git merge-tree" tried to come up with a
192
+ merge result tree object, which it failed (which is not wrong) and
193
+ led to a segfault (which is bad), which has been corrected.
194
+ source: <pull.1362.v5.git.1664350162.gitgitgadget@gmail.com>
195
+
196
+
197
+* mc/cred-helper-ignore-unknown (2022-09-22) 3 commits
198
+ (merged to 'next' on 2022-09-27 at ce6e3616aa)
199
+ + osxkeychain: clarify that we ignore unknown lines
200
+ + netrc: ignore unknown lines (do not die)
201
+ + wincred: ignore unknown lines (do not die)
202
+
203
+ Most credential helpers ignored unknown entries in a credential
204
+ description, but a few died upon seeing them. The latter were
205
+ taught to ignore them, too
206
+ source: <pull.1363.git.1663865974.gitgitgadget@gmail.com>
207
+
208
+
209
+* rj/ref-filter-get-head-description-leakfix (2022-09-26) 1 commit
210
+ (merged to 'next' on 2022-09-29 at d05d052eb1)
211
+ + ref-filter.c: fix a leak in get_head_description
212
+
213
+ Leakfix.
214
+ source: <6ff29e96-7f8d-c354-dced-b1b363e54467@gmail.com>
215
+
216
+
217
+* so/diff-merges-cleanup (2022-09-16) 3 commits
218
+ (merged to 'next' on 2022-09-22 at 57694bbed7)
219
+ + diff-merges: clarify log.diffMerges documentation
220
+ + diff-merges: cleanup set_diff_merges()
221
+ + diff-merges: cleanup func_by_opt()
222
+
223
+ Code clean-up.
224
+ source: <20220914193102.5275-1-sorganov@gmail.com>
225
+
226
+
227
+* sy/sparse-grep (2022-09-23) 1 commit
228
+ (merged to 'next' on 2022-09-29 at a5bc34b9c5)
229
+ + builtin/grep.c: integrate with sparse index
230
+
231
+ "git grep" learned to expand the sparse-index more lazily and on
232
+ demand in a sparse checkout.
233
+ source: <20220923041842.27817-2-shaoxuan.yuan02@gmail.com>
234
+
235
+
236
+* tb/midx-repack-ignore-cruft-packs (2022-09-21) 7 commits
237
+ (merged to 'next' on 2022-09-29 at 55474c6ecc)
238
+ + midx.c: avoid cruft packs with non-zero `repack --batch-size`
239
+ + midx.c: remove unnecessary loop condition
240
+ + midx.c: replace `xcalloc()` with `CALLOC_ARRAY()`
241
+ + midx.c: avoid cruft packs with `repack --batch-size=0`
242
+ + midx.c: prevent `expire` from removing the cruft pack
243
+ + Documentation/git-multi-pack-index.txt: clarify expire behavior
244
+ + Documentation/git-multi-pack-index.txt: fix typo
245
+
246
+ "git multi-pack-index repack/expire" used to repack unreachable
247
+ cruft into a new pack, which have been corrected.
248
+ cf. <63a1c3d4-eff3-af10-4263-058c88e74594@github.com>
249
+ source: <cover.1663638929.git.me@ttaylorr.com>
250
+
251
+
252
+* vd/fix-unaligned-read-index-v4 (2022-09-28) 1 commit
253
+ (merged to 'next' on 2022-09-28 at 5b3425fd58)
254
+ + read-cache: avoid misaligned reads in index v4
255
+
256
+ The codepath that reads from the index v4 had unaligned memory
257
+ accesses, which has been corrected.
258
+ source: <pull.1366.v2.git.1664385541084.gitgitgadget@gmail.com>
259
+
260
--------------------------------------------------
261
[New Topics]
262
52
-* jk/sequencer-missing-author-name-check (2022-10-03) 1 commit
53
- - sequencer: detect author name errors in read_author_script()
263
+* ab/coding-guidelines-c99 (2022-10-10) 5 commits
264
+ - CodingGuidelines: recommend against unportable C99 struct syntax
265
+ - CodingGuidelines: mention C99 features we can't use
266
+ - CodingGuidelines: allow declaring variables in for loops
267
+ - CodingGuidelines: mention dynamic C99 initializer elements
268
+ - CodingGuidelines: update for C99
269
55
- Typofix in code.
270
+ Update CodingGuidelines to clarify what features to use and avoid
271
+ in C99.
272
57
- Will merge to 'next'.
58
- source: <YzqhEcTDwMwa8dQX@coredump.intra.peff.net>
273
+ Will merge to 'next'?
274
+ source: <20221010203800.2154698-1-gitster@pobox.com>
275
276
61
-* pw/mailinfo-b-fix (2022-10-03) 1 commit
62
- - mailinfo -b: fix an out of bounds access
277
+* ds/bundle-uri-docfix (2022-10-07) 1 commit
278
+ (merged to 'next' on 2022-10-07 at 9ebc1e497a)
279
+ + bundle-uri: fix technical doc issues
280
64
- Fix a logic in "mailinfo -b" that miscomputed the length of a
65
- substring, which lead to an out-of-bounds access.
281
+ Doc formatting fix.
282
67
- Will merge to 'next'.
283
+ Will merge to 'master'.
284
+ source: <pull.1377.git.1665157810025.gitgitgadget@gmail.com>
285
286
70
-* pw/ssh-sign-report-errors (2022-10-05) 1 commit
71
- - ssh signing: return an error when signature cannot be read
287
+* jc/symbolic-ref-no-recurse (2022-10-09) 1 commit
288
+ - symbolic-ref: teach "--[no-]recurse" option
289
73
- The codepath to sign learned to report errors when it fails to read
74
- from "ssh-keygen".
290
+ After checking out a "branch" that is a symbolic-ref that points at
291
+ another branch, "git symbolic-ref HEAD" reports the underlying
292
+ branch, not the symbolic-ref the user gave checkout as argument.
293
+ The command learned the "--no-recurse" option to stop after
294
+ dereferencing a symbolic-ref only once.
295
+
296
+ Will merge to 'next'?
297
+ source: <xmqqleprcn08.fsf@gitster.g>
298
+
299
+
300
+* jc/use-of-uc-in-log-messages (2022-10-07) 1 commit
301
+ - SubmittingPatches: use usual capitalization in the log message body
302
+
303
+ Clarify that "the sentence after <area>: prefix does not begin with
304
+ a capital letter" rule applies only to the commit title.
305
306
Will merge to 'next'.
77
- source: <pull.1371.v2.git.1664877694430.gitgitgadget@gmail.com>
307
+ source: <xmqqedvjfqx1.fsf@gitster.g>
308
309
80
-* ab/run-hook-api-cleanup (2022-10-05) 15 commits
81
- - run-command.c: don't copy "ungroup" to "struct parallel_processes"
82
- - run-command.c: don't copy *_fn to "struct parallel_processes"
83
- - run-command API: move *_tr2() users to "run_processes_parallel()"
84
- - run-command API: have run_process_parallel() take an "opts" struct
85
- - run-command API: make run_process_parallel{,_tr2}() thin wrappers
86
- - run-command API: add nascent "struct run_process_parallel_opts"
87
- - run-command.c: add an initializer for "struct parallel_processes"
88
- - run-command API: don't fall back on online_cpus()
89
- - run-command API: make "jobs" parameter an "unsigned int"
90
- - run-command API: have "run_processes_parallel{,_tr2}()" return void
91
- - run-command tests: use "return", not "exit"
92
- - run-command test helper: use "else if" pattern
93
- - run-command tests: test stdout of run_command_parallel()
94
- - submodule tests: reset "trace.out" between "grep" invocations
95
- - hook tests: fix redirection logic error in 96e7225b310
310
+* ds/cmd-main-reorder (2022-10-08) 1 commit
311
+ - git.c: improve code readability in cmd_main()
312
97
- Move a global variable added as a hack during regression fixes to
98
- its proper place in the API.
313
+ Code clean-up.
314
100
- Needs review.
101
- source: <cover-00.15-00000000000-20220930T111343Z-avarab@gmail.com>
315
+ Will merge to 'next'?
316
+ source: <pull.1355.v3.git.git.1665246097190.gitgitgadget@gmail.com>
317
318
104
-* nb/doc-mergetool-typofix (2022-10-05) 1 commit
105
- - mergetool.txt: typofix 'overwriten' -> 'overwritten'
319
+* ed/fsmonitor-inotify (2022-10-09) 6 commits
320
+ . fsmonitor: update doc for Linux
321
+ . fsmonitor: test updates
322
+ . fsmonitor: enable fsmonitor for Linux
323
+ . fsmonitor: implement filesystem change listener for Linux
324
+ . fsmonitor: determine if filesystem is local or remote
325
+ . fsmonitor: prepare to share code between Mac OS and Linux
326
+ (this branch uses ed/fsmonitor-on-networked-macos.)
327
107
- Typofix.
328
+ Bundled fsmonitor for Linux using inotify API.
329
109
- Will merge to 'next'.
110
- source: <pull.1350.git.git.1664844924663.gitgitgadget@gmail.com>
330
+ Needs review.
331
+ source: <pull.1326.v15.git.1664904751.gitgitgadget@gmail.com>
332
+ source: <pull.1352.git.git.1665326258.gitgitgadget@gmail.com>
333
334
113
-* rs/bisect-start-leakfix (2022-10-05) 1 commit
114
- - bisect--helper: plug strvec leak in bisect_start()
335
+* en/sparse-checkout-design (2022-10-08) 1 commit
336
+ - sparse-checkout.txt: new document with sparse-checkout directions
337
116
- Code clean-up that results in plugging a leak.
338
+ source: <pull.1367.v3.git.1665269538608.gitgitgadget@gmail.com>
339
118
- Expecting a reroll.
119
- cf. <04d393cc-d8c7-ddf7-b235-12082f81c560@web.de>
120
- source: <5c6a4c30-d454-51b6-ec57-9af036b9c4e0@web.de>
340
341
+* jc/more-sanitizer-at-ci (2022-10-09) 1 commit
342
+ - ci: add address and undefined sanitizer tasks
343
123
-* rs/gc-pack-refs-simplify (2022-10-05) 1 commit
124
- - gc: simplify maintenance_task_pack_refs()
344
+
345
+* rs/use-fspathncmp (2022-10-08) 1 commit
346
+ - dir: use fspathncmp() in pl_hashmap_cmp()
347
348
Code clean-up.
349
350
Will merge to 'next'.
129
- source: <ab33f72e-d552-7bd7-bf04-3c476d32b5b6@web.de>
351
+ source: <cb6ffcdb-d719-7928-96b8-e46482dd141f@web.de>
352
+
353
+
354
+* jh/struct-zero-init-with-older-clang (2022-10-10) 1 commit
355
+ - config.mak.dev: disable suggest braces error on old clang versions
356
+
357
+ source: <pull.1375.v2.git.1665416340806.gitgitgadget@gmail.com>
358
+
359
+
360
+* od/ci-use-checkout-v3-when-applicable (2022-10-10) 2 commits
361
+ - ci(main): linux32 uses actions/checkout@v2
362
+ - ci(main): upgrade actions/checkout to v3
363
+
364
+ source: <pull.1354.git.git.1665388136.gitgitgadget@gmail.com>
365
+
366
+
367
+* pw/remove-rebase-p-test (2022-10-10) 1 commit
368
+ - t3435: remove redundant test case
369
+
370
+ source: <pull.1379.git.1665395106351.gitgitgadget@gmail.com>
371
+
372
+--------------------------------------------------
373
+[Stalled]
374
+
375
+* ag/merge-strategies-in-c (2022-08-10) 14 commits
376
+ - sequencer: use the "octopus" strategy without forking
377
+ - sequencer: use the "resolve" strategy without forking
378
+ - merge: use the "octopus" strategy without forking
379
+ - merge: use the "resolve" strategy without forking
380
+ - merge-octopus: rewrite in C
381
+ - merge-recursive: move better_branch_name() to merge.c
382
+ - merge-resolve: rewrite in C
383
+ - merge-one-file: rewrite in C
384
+ - update-index: move add_cacheinfo() to read-cache.c
385
+ - merge-index: add a new way to invoke `git-merge-one-file'
386
+ - merge-index: drop the index
387
+ - merge-index: libify merge_one_path() and merge_all()
388
+ - t6060: add tests for removed files
389
+ - t6060: modify multiple files to expose a possible issue with merge-index
390
+
391
+ An attempt to rewrite remaining merge strategies from shell to C.
392
+
393
+ Needs more work.
394
+ At the minimum, we should lose 11/14 and possibly 08/14.
395
+ cf. <xmqq7d36vfur.fsf@gitster.g>
396
+ source: <20220809185429.20098-1-alban.gruin@gmail.com>
397
+
398
+
399
+* po/glossary-around-traversal (2022-07-09) 3 commits
400
+ - glossary: add reachability bitmap description
401
+ - glossary: add commit graph description
402
+ - glossary: add Object DataBase (ODB) abbreviation
403
+
404
+ The glossary entries for "commit-graph file" and "reachability
405
+ bitmap" have been added.
406
+
407
+ Expecting a reroll.
408
+ cf. <dfe0c1ab-33f8-f13e-71ce-1829bb0d2d7f@iee.email>
409
+ source: <pull.1282.git.1657385781.gitgitgadget@gmail.com>
410
+
411
+
412
+* pw/rebase-keep-base-fixes (2022-09-07) 7 commits
413
+ - rebase --keep-base: imply --no-fork-point
414
+ - rebase --keep-base: imply --reapply-cherry-picks
415
+ - rebase: factor out branch_base calculation
416
+ - rebase: rename merge_base to branch_base
417
+ - rebase: store orig_head as a commit
418
+ - t3416: set $EDITOR in subshell
419
+ - t3416: tighten two tests
420
421
+ "git rebase --keep-base" used to discard the commits that are
422
+ already cherry-picked to the upstream, even when "keep-base" meant
423
+ that the base, on top of which the history is being rebuilt, does
424
+ not yet include these cherry-picked commits. The --keep-base
425
+ option now implies --reapply-cherry-picks and --no-fork-point
426
+ options.
427
132
-* rs/test-httpd-in-C-locale (2022-10-06) 1 commit
133
- - t/lib-httpd: pass LANG and LC_ALL to Apache
428
+ Expecting a reroll.
429
+ cf. <e25127f3-6135-b716-a12f-5dbe4f40dc42@gmail.com>
430
+ source: <pull.1323.v2.git.1662561470.gitgitgadget@gmail.com>
431
135
- Force C locale while running tests around httpd to make sure we can
136
- find expected error messages in the log.
432
138
- Will merge to 'next'.
139
- source: <a1699375-c660-13ab-42fb-26a8afe4c376@web.de>
433
+* js/cmake-updates (2022-08-24) 5 commits
434
+ - cmake: increase time-out for a long-running test
435
+ - cmake: avoid editing t/test-lib.sh
436
+ - add -p: avoid ambiguous signed/unsigned comparison
437
+ - cmake: copy the merge tools for testing
438
+ - cmake: make it easier to diagnose regressions in CTest runs
439
440
+ Update to build procedure with VS using CMake/CTest.
441
142
-* ab/unused-annotation (2022-10-05) 1 commit
143
- - git-compat-util.h: GCC deprecated message arg only in GCC 4.5+
442
+ Expecting a reroll.
443
+ cf. <3df77ffd-85a2-3a54-9005-34a24ec6e82d@github.com>
444
+ cf. <531620e1-de4c-74aa-c840-c12ce81f8740@github.com> and others
445
+ source: <pull.1320.v2.git.1661243463.gitgitgadget@gmail.com>
446
145
- source: <20221005221928.703750-1-asedeno@google.com>
447
448
+* gc/submodule-clone-update-with-branches (2022-08-29) 6 commits
449
+ - clone, submodule update: check out branches
450
+ - submodule--helper: refactor up-to-date criterion
451
+ - submodule: return target of submodule symref
452
+ - t5617: drop references to remote-tracking branches
453
+ - repo-settings: add submodule_propagate_branches
454
+ - clone: teach --detach option
455
148
-* dd/document-runtime-prefix-better (2022-10-05) 1 commit
149
- - Makefile: clarify runtime relative gitexecdir
456
+ "git clone --recurse-submodules" and "git submodule update" learns
457
+ to honor the "propagete branches" option.
458
151
- source: <20221006013205.15015-1-congdanhqx@gmail.com>
459
+ Expecting a reroll.
460
+ cf. <20220901200047.515294-1-jonathantanmy@google.com> and others
461
+ source: <pull.1321.git.git.1661806456.gitgitgadget@gmail.com>
462
463
154
-* jk/cleanup-callback-parameters (2022-10-06) 4 commits
155
- - attr: drop DEBUG_ATTR code
156
- - commit: avoid writing to global in option callback
157
- - multi-pack-index: avoid writing to global in option callback
158
- - test-submodule: inline resolve_relative_url() function
464
+* tb/diffstat-with-utf8-strwidth (2022-09-14) 1 commit
465
+ - diff.c: use utf8_strwidth() to count display width
466
160
- Code clean-up.
467
+ "git diff --stat" etc. were invented back when everything was ASCII
468
+ and strlen() was a way to measure the display width of a string;
469
+ adjust them to compute the display width assuming UTF-8 pathnames.
470
162
- Will merge to 'next'.
163
- source: <Yz7Tjy7Rh8cXVxYQ@coredump.intra.peff.net>
164
- source: <Yz7UhYXvNl6+1GbZ@coredump.intra.peff.net>
471
+ Expecting a reroll.
472
+ source: <20220914151333.3309-1-tboegi@web.de>
473
474
167
-* pw/test-todo (2022-10-06) 3 commits
168
- - test_todo: allow [verbose] test as the command
169
- - test_todo: allow [!] grep as the command
170
- - tests: add test_todo() to mark known breakages
475
+* mj/credential-helper-auth-headers (2022-09-13) 8 commits
476
+ - http: set specific auth scheme depending on credential
477
+ - http: move proactive auth to first slot creation
478
+ - http: store all request headers on active_request_slot
479
+ - credential: add WWW-Authenticate header to cred requests
480
+ - http: read HTTP WWW-Authenticate response headers
481
+ - osxkeychain: clarify that we ignore unknown lines
482
+ - netrc: ignore unknown lines (do not die)
483
+ - wincred: ignore unknown lines (do not die)
484
172
- RFC for test framework improvement.
485
+ Extending credential helper protocol.
486
174
- Needs review.
175
- source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>
487
+ Expecting a reroll.
488
+ A separate non-RFC submission of the first three is expected.
489
+ cf. <AS8PR03MB86897FAC3E1E4F03D4420644C04F9@AS8PR03MB8689.eurprd03.prod.outlook.com>
490
+ source: <pull.1352.git.1663097156.gitgitgadget@gmail.com>
491
177
---------------------------------------------------
178
-[Stalled]
492
493
* cw/submodule-status-in-parallel (2022-09-23) 4 commits
494
. diff-lib: parallelize run_diff_files for submodules
@@ -233,322 +546,214 @@ Release tarballs are available at:
546
--------------------------------------------------
547
[Cooking]
548
236
-* jc/tmp-objdir (2022-09-30) 1 commit
237
- - tmp-objdir: skip clean up when handling a signal
238
-
239
- The code to clean temporary object directories (used for
240
- quarantine) tried to remove them inside its signal handler, which
241
- was a no-no.
242
-
243
- Will merge to 'next'?
244
- source: <pull.1348.v4.git.git.1664570831583.gitgitgadget@gmail.com>
245
-
246
-
247
-* jc/branch-description-unset (2022-09-30) 1 commit
248
- - branch: do not fail a no-op --edit-desc
249
-
250
- "GIT_EDITOR=: git branch --edit-description" resulted in failure,
251
- which has been corrected.
252
-
253
- Will merge to 'next'?
254
- source: <xmqqmtagka8x.fsf@gitster.g>
255
-
256
-
257
-* rj/branch-edit-desc-unborn (2022-09-30) 1 commit
258
- - branch: description for non-existent branch errors
259
-
260
- "git branch --edit-description" on an unborh branch misleadingly
261
- said that no such branch exists, which has been corrected.
262
-
263
- Will merge to 'next'?
264
- source: <930ff836-a5c4-0e85-517d-39645f00cd31@gmail.com>
265
-
266
-
267
-* ab/test-malloc-with-sanitize-leak (2022-09-29) 1 commit
268
- (merged to 'next' on 2022-09-29 at b6fef2dd1f)
269
- + test-lib: have SANITIZE=leak imply TEST_NO_MALLOC_CHECK
270
-
271
- Test fix.
272
-
273
- Will merge to 'master'?
274
- source: <patch-1.1-e31681731b7-20220928T095041Z-avarab@gmail.com>
275
-
276
-
277
-* ah/branch-autosetupmerge-grammofix (2022-09-28) 1 commit
278
- (merged to 'next' on 2022-09-29 at 622b75f0da)
279
- + push: improve grammar of branch.autoSetupMerge advice
280
-
281
- Fix grammar of a message introduced in previous round.
282
-
283
- Will merge to 'master'?
284
- source: <20220928055811.777227-1-alexhenrie24@gmail.com>
285
-
286
-
287
-* jt/promisor-remote-fetch-tweak (2022-10-05) 2 commits
288
- - promisor-remote: die upon failing fetch
289
- - promisor-remote: remove a return value
290
-
291
- Remove error detection from a function that fetches from promisor
292
- remotes, and make it die when such a fetch fails to bring all the
293
- requested objects, to give an early failure to various operations.
294
-
295
- Will merge to 'next'?
296
- Can somebody give a quick read on the test part of the patch?
297
- source: <cover.1664917853.git.jonathantanmy@google.com>
298
-
299
-
300
-* rj/ref-filter-get-head-description-leakfix (2022-09-26) 1 commit
301
- (merged to 'next' on 2022-09-29 at d05d052eb1)
302
- + ref-filter.c: fix a leak in get_head_description
303
-
304
- Leakfix.
305
-
306
- Will merge to 'master'?
307
- source: <6ff29e96-7f8d-c354-dced-b1b363e54467@gmail.com>
308
-
309
-
310
-* ds/scalar-unregister-idempotent (2022-09-27) 4 commits
311
- (merged to 'next' on 2022-09-28 at a09a78d861)
312
- + string-list: document iterator behavior on NULL input
313
- + gc: replace config subprocesses with API calls
314
- + scalar: make 'unregister' idempotent
315
- + maintenance: add 'unregister --force'
316
-
317
- "git maintenance unregister" in a repository that is already been
318
- unregistered reported an error.
319
-
320
- Will merge to 'master'?
321
- source: <pull.1358.v4.git.1664287021.gitgitgadget@gmail.com>
322
-
323
-
324
-* jk/clone-allow-bare-and-o-together (2022-09-22) 1 commit
325
- (merged to 'next' on 2022-09-27 at 1feca721ac)
326
- + clone: allow "--bare" with "-o"
549
+* jk/sequencer-missing-author-name-check (2022-10-03) 1 commit
550
+ (merged to 'next' on 2022-10-07 at 6a9f7e8b80)
551
+ + sequencer: detect author name errors in read_author_script()
552
328
- "git clone" did not like to see the "--bare" and the "--origin"
329
- options used together without a good reason.
553
+ Typofix in code.
554
331
- Will merge to 'master'?
332
- source: <YyvzVdfQVdysvMp2@coredump.intra.peff.net>
555
+ Will merge to 'master'.
556
+ source: <YzsdRuD2CdJFdNVG@coredump.intra.peff.net>
557
558
335
-* jk/fsck-on-diet (2022-09-22) 3 commits
336
- (merged to 'next' on 2022-09-27 at c2e93082a1)
337
- + parse_object_buffer(): respect save_commit_buffer
338
- + fsck: turn off save_commit_buffer
339
- + fsck: free tree buffers after walking unreachable objects
559
+* pw/mailinfo-b-fix (2022-10-03) 1 commit
560
+ (merged to 'next' on 2022-10-07 at 5c5d79daef)
561
+ + mailinfo -b: fix an out of bounds access
562
341
- "git fsck" failed to release contents of tree objects already used
342
- from the memory, which has been fixed.
563
+ Fix a logic in "mailinfo -b" that miscomputed the length of a
564
+ substring, which lead to an out-of-bounds access.
565
344
- Will merge to 'master'?
345
- source: <Yyw0PSVe3YTQGgRS@coredump.intra.peff.net>
566
+ Will merge to 'master'.
567
+ source: <pull.1372.git.1664789011089.gitgitgadget@gmail.com>
568
569
348
-* jk/remote-rename-without-fetch-refspec (2022-09-22) 1 commit
349
- (merged to 'next' on 2022-09-27 at 165fe0a832)
350
- + remote: handle rename of remote without fetch refspec
570
+* pw/ssh-sign-report-errors (2022-10-05) 1 commit
571
+ (merged to 'next' on 2022-10-07 at 4df1d2379a)
572
+ + ssh signing: return an error when signature cannot be read
573
352
- "git remote rename" failed to rename a remote without fetch
353
- refspec, which has been corrected.
574
+ The codepath to sign learned to report errors when it fails to read
575
+ from "ssh-keygen".
576
355
- Will merge to 'master'?
356
- source: <YyvzqZ5tmI0UdRAW@coredump.intra.peff.net>
577
+ Will merge to 'master'.
578
+ source: <pull.1371.v2.git.1664877694430.gitgitgadget@gmail.com>
579
580
359
-* js/merge-ort-in-read-only-repo (2022-09-28) 2 commits
360
- (merged to 'next' on 2022-09-29 at 84df46c1b4)
361
- + merge-ort: return early when failing to write a blob
362
- + merge-ort: fix segmentation fault in read-only repositories
581
+* ab/run-hook-api-cleanup (2022-10-05) 15 commits
582
+ - run-command.c: don't copy "ungroup" to "struct parallel_processes"
583
+ - run-command.c: don't copy *_fn to "struct parallel_processes"
584
+ - run-command API: move *_tr2() users to "run_processes_parallel()"
585
+ - run-command API: have run_process_parallel() take an "opts" struct
586
+ - run-command API: make run_process_parallel{,_tr2}() thin wrappers
587
+ - run-command API: add nascent "struct run_process_parallel_opts"
588
+ - run-command.c: add an initializer for "struct parallel_processes"
589
+ - run-command API: don't fall back on online_cpus()
590
+ - run-command API: make "jobs" parameter an "unsigned int"
591
+ - run-command API: have "run_processes_parallel{,_tr2}()" return void
592
+ - run-command tests: use "return", not "exit"
593
+ - run-command test helper: use "else if" pattern
594
+ - run-command tests: test stdout of run_command_parallel()
595
+ - submodule tests: reset "trace.out" between "grep" invocations
596
+ - hook tests: fix redirection logic error in 96e7225b310
597
364
- In read-only repositories, "git merge-tree" tried to come up with a
365
- merge result tree object, which it failed (which is not wrong) and
366
- led to a segfault (which is bad), which has been corrected.
598
+ Move a global variable added as a hack during regression fixes to
599
+ its proper place in the API.
600
368
- Will merge to 'master'?
369
- source: <pull.1362.v5.git.1664350162.gitgitgadget@gmail.com>
601
+ Needs review.
602
+ source: <cover-00.15-00000000000-20220930T111343Z-avarab@gmail.com>
603
604
372
-* mc/cred-helper-ignore-unknown (2022-09-22) 3 commits
373
- (merged to 'next' on 2022-09-27 at ce6e3616aa)
374
- + osxkeychain: clarify that we ignore unknown lines
375
- + netrc: ignore unknown lines (do not die)
376
- + wincred: ignore unknown lines (do not die)
605
+* nb/doc-mergetool-typofix (2022-10-05) 1 commit
606
+ (merged to 'next' on 2022-10-07 at d309a9a130)
607
+ + mergetool.txt: typofix 'overwriten' -> 'overwritten'
608
378
- Most credential helpers ignored unknown entries in a credential
379
- description, but a few died upon seeing them. The latter were
380
- taught to ignore them, too
609
+ Typofix.
610
382
- Will merge to 'master'?
383
- source: <pull.1363.git.1663865974.gitgitgadget@gmail.com>
611
+ Will merge to 'master'.
612
+ source: <pull.1350.git.git.1664844924663.gitgitgadget@gmail.com>
613
614
386
-* es/retire-efgrep (2022-09-23) 2 commits
387
- (merged to 'next' on 2022-09-27 at 344fdd138e)
388
- + check-non-portable-shell: detect obsolescent egrep/fgrep
389
- + Merge branch 'dd/retire-efgrep' into es/retire-efgrep
390
- (this branch uses dd/retire-efgrep.)
615
+* rs/bisect-start-leakfix (2022-10-07) 1 commit
616
+ - bisect--helper: plug strvec leak
617
392
- Prepare for GNU [ef]grep that throw warning of their uses.
618
+ Code clean-up that results in plugging a leak.
619
394
- Will merge to 'master'.
395
- source: <pull.1338.git.git.1663805905554.gitgitgadget@gmail.com>
620
+ Will merge to 'next'.
621
+ source: <1965b54b-122a-c965-f886-1a7dd6afbfb4@web.de>
622
623
398
-* vd/fix-unaligned-read-index-v4 (2022-09-28) 1 commit
399
- (merged to 'next' on 2022-09-28 at 5b3425fd58)
400
- + read-cache: avoid misaligned reads in index v4
624
+* rs/gc-pack-refs-simplify (2022-10-05) 1 commit
625
+ (merged to 'next' on 2022-10-07 at ef7d12408d)
626
+ + gc: simplify maintenance_task_pack_refs()
627
402
- The codepath that reads from the index v4 had unaligned memory
403
- accesses, which has been corrected.
628
+ Code clean-up.
629
630
Will merge to 'master'.
406
- source: <pull.1366.v2.git.1664385541084.gitgitgadget@gmail.com>
631
+ source: <ab33f72e-d552-7bd7-bf04-3c476d32b5b6@web.de>
632
633
409
-* dd/retire-efgrep (2022-09-21) 4 commits
410
- (merged to 'next' on 2022-09-21 at 22bc339be1)
411
- + t: convert fgrep usage to "grep -F"
412
- + t: convert egrep usage to "grep -E"
413
- + t: remove \{m,n\} from BRE grep usage
414
- + CodingGuidelines: allow grep -E
415
- (this branch is used by es/retire-efgrep.)
634
+* rs/test-httpd-in-C-locale (2022-10-06) 1 commit
635
+ (merged to 'next' on 2022-10-07 at 832c1e856a)
636
+ + t/lib-httpd: pass LANG and LC_ALL to Apache
637
417
- Prepare for GNU [ef]grep that throw warning of their uses.
638
+ Force C locale while running tests around httpd to make sure we can
639
+ find expected error messages in the log.
640
641
Will merge to 'master'.
420
- source: <cover.1663765176.git.congdanhqx@gmail.com>
642
+ source: <a1699375-c660-13ab-42fb-26a8afe4c376@web.de>
643
644
423
-* tb/midx-repack-ignore-cruft-packs (2022-09-21) 7 commits
424
- (merged to 'next' on 2022-09-29 at 55474c6ecc)
425
- + midx.c: avoid cruft packs with non-zero `repack --batch-size`
426
- + midx.c: remove unnecessary loop condition
427
- + midx.c: replace `xcalloc()` with `CALLOC_ARRAY()`
428
- + midx.c: avoid cruft packs with `repack --batch-size=0`
429
- + midx.c: prevent `expire` from removing the cruft pack
430
- + Documentation/git-multi-pack-index.txt: clarify expire behavior
431
- + Documentation/git-multi-pack-index.txt: fix typo
645
+* ab/unused-annotation (2022-10-05) 1 commit
646
+ - git-compat-util.h: GCC deprecated message arg only in GCC 4.5+
647
433
- "git multi-pack-index repack/expire" used to repack unreachable
434
- cruft into a new pack, which have been corrected.
648
+ Compilation fix for ancient compilers.
649
436
- Will merge to 'master'?
437
- cf. <63a1c3d4-eff3-af10-4263-058c88e74594@github.com>
438
- source: <cover.1663638929.git.me@ttaylorr.com>
650
+ Will merge to 'next'.
651
+ source: <20221005221928.703750-1-asedeno@google.com>
652
653
441
-* ah/fsmonitor-daemon-usage-non-l10n (2022-09-21) 1 commit
442
- (merged to 'next' on 2022-09-21 at bc69a73c6c)
443
- + fsmonitor--daemon: don't translate literal commands
654
+* dd/document-runtime-prefix-better (2022-10-05) 1 commit
655
+ - Makefile: clarify runtime relative gitexecdir
656
445
- Fix messages incorrectly marked for translation.
657
+ Doc updates.
658
447
- Will merge to 'master'?
448
- source: <20220920050709.326359-1-alexhenrie24@gmail.com>
659
+ Will merge to 'next'.
660
+ source: <20221006013205.15015-1-congdanhqx@gmail.com>
661
662
451
-* so/diff-merges-cleanup (2022-09-16) 3 commits
452
- (merged to 'next' on 2022-09-22 at 57694bbed7)
453
- + diff-merges: clarify log.diffMerges documentation
454
- + diff-merges: cleanup set_diff_merges()
455
- + diff-merges: cleanup func_by_opt()
663
+* jk/cleanup-callback-parameters (2022-10-06) 4 commits
664
+ - attr: drop DEBUG_ATTR code
665
+ - commit: avoid writing to global in option callback
666
+ - multi-pack-index: avoid writing to global in option callback
667
+ - test-submodule: inline resolve_relative_url() function
668
669
Code clean-up.
670
459
- Will merge to 'master'?
460
- source: <20220914193102.5275-1-sorganov@gmail.com>
671
+ Will merge to 'next'.
672
+ source: <Yz7Tjy7Rh8cXVxYQ@coredump.intra.peff.net>
673
+ source: <Yz7UhYXvNl6+1GbZ@coredump.intra.peff.net>
674
675
463
-* ja/rebase-i-avoid-amending-self (2022-09-26) 1 commit
464
- (merged to 'next' on 2022-09-29 at 2635f37dae)
465
- + sequencer: avoid dropping fixup commit that targets self via commit-ish
676
+* pw/test-todo (2022-10-06) 3 commits
677
+ - test_todo: allow [verbose] test as the command
678
+ - test_todo: allow [!] grep as the command
679
+ - tests: add test_todo() to mark known breakages
680
467
- "git rebase -i" can mistakenly attempt to apply a fixup to a commit
468
- itself, which has been corrected.
681
+ RFC for test framework improvement.
682
470
- Will merge to 'master'?
471
- source: <20220924222904.1784975-1-aclopte@gmail.com>
683
+ Needs review.
684
+ source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>
685
686
474
-* ac/fuzzers (2022-09-19) 1 commit
475
- (merged to 'next' on 2022-09-29 at 600f45a53b)
476
- + fuzz: reorganise the path for existing oss-fuzz fuzzers
687
+* jc/tmp-objdir (2022-09-30) 1 commit
688
+ - tmp-objdir: skip clean up when handling a signal
689
478
- Source file shuffling.
690
+ The code to clean temporary object directories (used for
691
+ quarantine) tried to remove them inside its signal handler, which
692
+ was a no-no.
693
480
- Will merge to 'master'.
481
- source: <pull.1353.v4.git.1663598215154.gitgitgadget@gmail.com>
694
+ Will merge to 'next'.
695
+ source: <pull.1348.v4.git.git.1664570831583.gitgitgadget@gmail.com>
696
697
484
-* hn/parse-worktree-ref (2022-09-19) 1 commit
485
- (merged to 'next' on 2022-09-29 at 1f4453eb83)
486
- + refs: unify parse_worktree_ref() and ref_type()
698
+* jc/branch-description-unset (2022-09-30) 1 commit
699
+ - branch: do not fail a no-op --edit-desc
700
488
- Code and semantics cleaning.
701
+ "GIT_EDITOR=: git branch --edit-description" resulted in failure,
702
+ which has been corrected.
703
490
- Will merge to 'master'?
491
- source: <pull.1325.v2.git.git.1663605291172.gitgitgadget@gmail.com>
704
+ Will merge to 'next'.
705
+ source: <xmqqmtagka8x.fsf@gitster.g>
706
707
494
-* ed/fsmonitor-on-networked-macos (2022-10-05) 6 commits
495
- - fsmonitor: add documentation for allowRemote and socketDir options
496
- - fsmonitor: check for compatability before communicating with fsmonitor
497
- - fsmonitor: deal with synthetic firmlinks on macOS
498
- - fsmonitor: avoid socket location check if using hook
499
- - fsmonitor: relocate socket file if .git directory is remote
500
- - fsmonitor: refactor filesystem checks to common interface
708
+* rj/branch-edit-desc-unborn (2022-10-07) 1 commit
709
+ - branch: description for non-existent branch errors
710
502
- By default, use of fsmonitor on a repository on networked
503
- filesystem is disabled. Add knobs to make it workable on macOS.
711
+ "git branch --edit-description" on an unborh branch misleadingly
712
+ said that no such branch exists, which has been corrected.
713
714
Will merge to 'next'.
506
- source: <pull.1326.v15.git.1664904751.gitgitgadget@gmail.com>
715
+ source: <8d627a2c-923f-181f-a03b-15f370c4dd0f@gmail.com>
716
717
509
-* rj/branch-edit-description-with-nth-checkout (2022-09-12) 2 commits
510
- - branch: support for shortcuts like @{-1} completed
511
- - branch: refactor "edit_description" code path
718
+* jt/promisor-remote-fetch-tweak (2022-10-05) 2 commits
719
+ - promisor-remote: die upon failing fetch
720
+ - promisor-remote: remove a return value
721
513
- "git branch --edit-description @{-1}" is now a way to edit branch
514
- description of the branch you were on before switching to the
515
- current branch.
722
+ Remove error detection from a function that fetches from promisor
723
+ remotes, and make it die when such a fetch fails to bring all the
724
+ requested objects, to give an early failure to various operations.
725
517
- Needs review.
518
- source: <7abdb5a9-5707-7897-4196-8d2892beeb81@gmail.com>
726
+ Will merge to 'next'.
727
+ source: <cover.1664917853.git.jonathantanmy@google.com>
728
729
521
-* mj/credential-helper-auth-headers (2022-09-13) 8 commits
522
- - http: set specific auth scheme depending on credential
523
- - http: move proactive auth to first slot creation
524
- - http: store all request headers on active_request_slot
525
- - credential: add WWW-Authenticate header to cred requests
526
- - http: read HTTP WWW-Authenticate response headers
527
- - osxkeychain: clarify that we ignore unknown lines
528
- - netrc: ignore unknown lines (do not die)
529
- - wincred: ignore unknown lines (do not die)
730
+* ed/fsmonitor-on-networked-macos (2022-10-05) 6 commits
731
+ (merged to 'next' on 2022-10-07 at fe9f182bde)
732
+ + fsmonitor: add documentation for allowRemote and socketDir options
733
+ + fsmonitor: check for compatability before communicating with fsmonitor
734
+ + fsmonitor: deal with synthetic firmlinks on macOS
735
+ + fsmonitor: avoid socket location check if using hook
736
+ + fsmonitor: relocate socket file if .git directory is remote
737
+ + fsmonitor: refactor filesystem checks to common interface
738
+ (this branch is used by ed/fsmonitor-inotify.)
739
531
- Extending credential helper protocol.
740
+ By default, use of fsmonitor on a repository on networked
741
+ filesystem is disabled. Add knobs to make it workable on macOS.
742
533
- Expecting a reroll.
534
- A separate non-RFC submission of the first three is expected.
535
- cf. <AS8PR03MB86897FAC3E1E4F03D4420644C04F9@AS8PR03MB8689.eurprd03.prod.outlook.com>
536
- source: <pull.1352.git.1663097156.gitgitgadget@gmail.com>
743
+ Will merge to 'master'.
744
+ source: <pull.1326.v15.git.1664904751.gitgitgadget@gmail.com>
745
746
539
-* jc/environ-docs (2022-09-16) 5 commits
540
- (merged to 'next' on 2022-09-29 at a0a43b8de5)
541
- + environ: GIT_INDEX_VERSION affects not just a new repository
542
- + environ: simplify description of GIT_INDEX_FILE
543
- + environ: GIT_FLUSH should be made a usual Boolean
544
- + environ: explain Boolean environment variables
545
- + environ: document GIT_SSL_NO_VERIFY
747
+* rj/branch-edit-description-with-nth-checkout (2022-10-09) 2 commits
748
+ - SQUASH???
749
+ - branch: support for shortcuts like @{-1}, completed
750
547
- Documentation on various Boolean GIT_* environment variables have
548
- been clarified.
751
+ "git branch --edit-description @{-1}" is now a way to edit branch
752
+ description of the branch you were on before switching to the
753
+ current branch.
754
550
- Will merge to 'master'?
551
- source: <20220915160659.126441-1-gitster@pobox.com>
755
+ Expecting a reroll.
756
+ source: <de200fa0-379d-c1ce-8446-9e4292d0b66a@gmail.com>
757
758
759
* rs/diff-caret-bang-with-parents (2022-10-01) 3 commits
@@ -625,58 +830,11 @@ Release tarballs are available at:
830
source: <cover-v2-0.9-00000000000-20220831T205130Z-avarab@gmail.com>
831
832
628
-* tb/diffstat-with-utf8-strwidth (2022-09-14) 1 commit
629
- - diff.c: use utf8_strwidth() to count display width
630
-
631
- "git diff --stat" etc. were invented back when everything was ASCII
632
- and strlen() was a way to measure the display width of a string;
633
- adjust them to compute the display width assuming UTF-8 pathnames.
634
-
635
- Expecting a reroll.
636
- source: <20220914151333.3309-1-tboegi@web.de>
637
-
638
-
639
-* gc/submodule-clone-update-with-branches (2022-08-29) 6 commits
640
- - clone, submodule update: check out branches
641
- - submodule--helper: refactor up-to-date criterion
642
- - submodule: return target of submodule symref
643
- - t5617: drop references to remote-tracking branches
644
- - repo-settings: add submodule_propagate_branches
645
- - clone: teach --detach option
646
-
647
- "git clone --recurse-submodules" and "git submodule update" learns
648
- to honor the "propagete branches" option.
649
-
650
- Expecting a reroll.
651
- cf. <20220901200047.515294-1-jonathantanmy@google.com> and others
652
- source: <pull.1321.git.git.1661806456.gitgitgadget@gmail.com>
653
-
654
-
655
-* sy/sparse-grep (2022-09-23) 1 commit
656
- (merged to 'next' on 2022-09-29 at a5bc34b9c5)
657
- + builtin/grep.c: integrate with sparse index
658
-
659
- "git grep" learned to expand the sparse-index more lazily and on
660
- demand in a sparse checkout.
661
-
662
- Will merge to 'master'?
663
- source: <20220923041842.27817-2-shaoxuan.yuan02@gmail.com>
664
-
665
-
666
-* ds/use-platform-regex-on-macos (2022-08-26) 1 commit
667
- (merged to 'next' on 2022-09-14 at 80905596d8)
668
- + grep: fix multibyte regex handling under macOS
669
-
670
- With a bit of header twiddling, use the native regexp library on
671
- macOS instead of the compat/ one.
672
-
673
- Will merge to 'master'.
674
- source: <20220826085815.2771102-1-dds@aueb.gr>
675
-
676
-
677
-* ds/bundle-uri-3 (2022-10-05) 10 commits
833
+* ds/bundle-uri-3 (2022-10-10) 12 commits
834
- bundle-uri: suppress stderr from remote-https
835
+ - bundle-uri: quiet failed unbundlings
836
- bundle-uri: fetch a list of bundles
837
+ - bundle: add flags to verify_bundle(), skip walk
838
- bundle-uri: limit recursion depth for bundle lists
839
- bundle-uri: parse bundle list in config format
840
- bundle-uri: unit test "key=value" parsing
@@ -691,80 +849,7 @@ Release tarballs are available at:
849
them.
850
851
Needs review.
694
- source: <pull.1333.v3.git.1664886860.gitgitgadget@gmail.com>
695
-
696
-
697
-* js/cmake-updates (2022-08-24) 5 commits
698
- - cmake: increase time-out for a long-running test
699
- - cmake: avoid editing t/test-lib.sh
700
- - add -p: avoid ambiguous signed/unsigned comparison
701
- - cmake: copy the merge tools for testing
702
- - cmake: make it easier to diagnose regressions in CTest runs
703
-
704
- Update to build procedure with VS using CMake/CTest.
705
-
706
- Expecting a reroll.
707
- cf. <3df77ffd-85a2-3a54-9005-34a24ec6e82d@github.com>
708
- cf. <531620e1-de4c-74aa-c840-c12ce81f8740@github.com> and others
709
- source: <pull.1320.v2.git.1661243463.gitgitgadget@gmail.com>
710
-
711
-
712
-* pw/rebase-keep-base-fixes (2022-09-07) 7 commits
713
- - rebase --keep-base: imply --no-fork-point
714
- - rebase --keep-base: imply --reapply-cherry-picks
715
- - rebase: factor out branch_base calculation
716
- - rebase: rename merge_base to branch_base
717
- - rebase: store orig_head as a commit
718
- - t3416: set $EDITOR in subshell
719
- - t3416: tighten two tests
720
-
721
- "git rebase --keep-base" used to discard the commits that are
722
- already cherry-picked to the upstream, even when "keep-base" meant
723
- that the base, on top of which the history is being rebuilt, does
724
- not yet include these cherry-picked commits. The --keep-base
725
- option now implies --reapply-cherry-picks and --no-fork-point
726
- options.
727
-
728
- Expecting a reroll.
729
- cf. <e25127f3-6135-b716-a12f-5dbe4f40dc42@gmail.com>
730
- source: <pull.1323.v2.git.1662561470.gitgitgadget@gmail.com>
731
-
732
-
733
-* ag/merge-strategies-in-c (2022-08-10) 14 commits
734
- - sequencer: use the "octopus" strategy without forking
735
- - sequencer: use the "resolve" strategy without forking
736
- - merge: use the "octopus" strategy without forking
737
- - merge: use the "resolve" strategy without forking
738
- - merge-octopus: rewrite in C
739
- - merge-recursive: move better_branch_name() to merge.c
740
- - merge-resolve: rewrite in C
741
- - merge-one-file: rewrite in C
742
- - update-index: move add_cacheinfo() to read-cache.c
743
- - merge-index: add a new way to invoke `git-merge-one-file'
744
- - merge-index: drop the index
745
- - merge-index: libify merge_one_path() and merge_all()
746
- - t6060: add tests for removed files
747
- - t6060: modify multiple files to expose a possible issue with merge-index
748
-
749
- An attempt to rewrite remaining merge strategies from shell to C.
750
-
751
- Needs more work.
752
- At the minimum, we should lose 11/14 and possibly 08/14.
753
- cf. <xmqq7d36vfur.fsf@gitster.g>
754
- source: <20220809185429.20098-1-alban.gruin@gmail.com>
755
-
756
-
757
-* po/glossary-around-traversal (2022-07-09) 3 commits
758
- - glossary: add reachability bitmap description
759
- - glossary: add commit graph description
760
- - glossary: add Object DataBase (ODB) abbreviation
761
-
762
- The glossary entries for "commit-graph file" and "reachability
763
- bitmap" have been added.
764
-
765
- Expecting a reroll.
766
- cf. <dfe0c1ab-33f8-f13e-71ce-1829bb0d2d7f@iee.email>
767
- source: <pull.1282.git.1657385781.gitgitgadget@gmail.com>
852
+ source: <pull.1333.v4.git.1665417859.gitgitgadget@gmail.com>
853
854
855
* js/bisect-in-c (2022-08-30) 17 commits