What's cooking (2022/07 #02)
Junio C Hamano committed
Jul 8, 2022 at 16:19 UTC
341c4206c65df54d9901018f01b699e685767c48
1 file changed
+312
-181
whats-cooking.txt
+312
-181
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2022, #01; Fri, 1)
3
-X-master-at: e4a4b31577c7419497ac30cebe30d755b97752c5
4
-X-next-at: 8ac04bfd244e0d302aaeb6ab241eb092dcf6a733
2
+Subject: What's cooking in git.git (Jul 2022, #02; Fri, 8)
3
+X-master-at: 30cc8d0f147546d4dd77bf497f4dec51e7265bd8
4
+X-next-at: cef32db0b66f484ee602159300027f9396ab5473
5
6
-What's cooking in git.git (Jul 2022, #01; Fri, 1)
6
+What's cooking in git.git (Jul 2022, #02; Fri, 8)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -12,12 +12,6 @@ topic is stable enough to be used and are candidate to be in a
12
future release). Commits prefixed with '-' are only in 'seen',
13
and aren't considered "accepted" at all.
14
15
-Git 2.37 final was released, many in the northan hemisphere are
16
-about to be in summer vacation week. We probably will have a small
17
-update 2.37.1 near mid July to deal with a small "regression" in
18
-2.37 but otherwise things are expected to be slow, and slow is good
19
-;-)
20
-
15
Copies of the source code to Git live in many repositories, and the
16
following is a list of the ones I push into or their mirrors. Some
17
repositories have only a subset of branches.
@@ -49,12 +43,170 @@ Release tarballs are available at:
43
--------------------------------------------------
44
[New Topics]
45
52
-* ds/git-rebase-doc-markup (2022-06-30) 1 commit
53
- - git-rebase.txt: use back-ticks consistently
46
+* ab/cocci-unused (2022-07-06) 6 commits
47
+ - cocci: generalize "unused" rule to cover more than "strbuf"
48
+ - cocci: add and apply a rule to find "unused" strbufs
49
+ - cocci: have "coccicheck{,-pending}" depend on "coccicheck-test"
50
+ - cocci: add a "coccicheck-test" target and test *.cocci rules
51
+ - Makefile & .gitignore: ignore & clean "git.res", not "*.res"
52
+ - Makefile: remove mandatory "spatch" arguments from SPATCH_FLAGS
53
+
54
+ Add Coccinelle rules to detect the pattern of initializing and then
55
+ finalizing a structure without using it in between at all, which
56
+ happens after code restructuring and the compilers fail to
57
+ recognize as an unused varilable.
58
+
59
+ Will merge to 'next'.
60
+ source: <cover-v4-0.6-00000000000-20220705T134033Z-avarab@gmail.com>
61
+
62
+
63
+* jk/clone-unborn-confusion (2022-07-07) 3 commits
64
+ - clone: use remote branch if it matches default HEAD
65
+ - clone: propagate empty remote HEAD even with other branches
66
+ - clone: drop extra newline from warning message
67
+
68
+ "git clone" from a repository with some ref whose HEAD is unborn
69
+ did not set the HEAD in the resulting repository correctly, which
70
+ has been corrected.
71
+
72
+ Will merge to 'next'?
73
+ source: <YsdyLS4UFzj0j/wB@coredump.intra.peff.net>
74
+
75
+
76
+* ac/bitmap-lookup-table (2022-07-06) 6 commits
77
+ - p5310-pack-bitmaps.sh: remove pack.writeReverseIndex
78
+ - bitmap-lookup-table: add performance tests for lookup table
79
+ - pack-bitmap: prepare to read lookup table extension
80
+ - pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests
81
+ - pack-bitmap-write.c: write lookup table extension
82
+ - Documentation/technical: describe bitmap lookup table extension
83
+
84
+ The pack bitmap file gained a bitmap-lookup table to speed up
85
+ locating the necessary bitmap for a given commit.
86
+
87
+ Will merge to 'next'?
88
+ source: <pull.1266.v3.git.1656924376.gitgitgadget@gmail.com>
89
+
90
+
91
+* bc/nettle-sha256 (2022-07-07) 1 commit
92
+ - sha256: add support for Nettle
93
+
94
+ Support for libnettle as SHA256 implementation has been added.
95
+
96
+ Expecting a reroll.
97
+ cf. <YsTgmv+h2SFFFMga@tapette.crustytoothpaste.net>
98
+ source: <20220705230518.713218-1-sandals@crustytoothpaste.net>
99
+
100
+
101
+* jc/builtin-mv-move-array (2022-07-06) 1 commit
102
+ - builtin/mv.c: use the MOVE_ARRAY() macro instead of memmove()
103
+
104
+ Apply Coccinelle rule to turn raw memmove() into MOVE_ARRAY() cpp
105
+ macro, which would improve maintainability and readability.
106
+
107
+ Will merge to 'next'?
108
+ source: <xmqqy1x531vp.fsf@gitster.g>
109
+
110
+
111
+* jd/gpg-interface-trust-level-string (2022-07-08) 1 commit
112
+ - gpg-interface: add function for converting trust level to string
113
55
- Correct "git rebase" documentation mark-up.
114
+ The code to convert between GPG trust level strings and internal
115
+ constants we use to represent them have been cleaned up.
116
117
Will merge to 'next'.
118
+ source: <pull.1281.v2.git.1657279447515.gitgitgadget@gmail.com>
119
+
120
+
121
+* kk/p4-client-name-encoding-fix (2022-07-08) 1 commit
122
+ - git-p4: fix bug with encoding of p4 client name
123
+
124
+ "git p4" did not handle non-ASCII client name well, which has been
125
+ corrected.
126
+
127
+ Will merge to 'next'.
128
+ source: <pull.1285.git.git.1657267260405.gitgitgadget@gmail.com>
129
+
130
+
131
+* sa/cat-file-mailmap (2022-07-07) 5 commits
132
+ - SQUASH???
133
+ - cat-file: add mailmap support
134
+ - ident: rename commit_rewrite_person() to apply_mailmap_to_header()
135
+ - ident: move commit_rewrite_person() to ident.c
136
+ - revision: improve commit_rewrite_person()
137
+
138
+ source: <20220707161554.6900-1-siddharthasthana31@gmail.com>
139
+
140
+
141
+* fr/vimdiff-layout-fix (2022-07-08) 1 commit
142
+ - vimdiff: make layout engine more robust against user vim settings
143
+
144
+ source: <20220708181024.45839-1-greenfoo@u92.eu>
145
+
146
+--------------------------------------------------
147
+[Graduated to 'master']
148
+
149
+* js/add-i-delete (2022-06-28) 1 commit
150
+ (merged to 'next' on 2022-06-28 at 8ac04bfd24)
151
+ + add --interactive: allow `update` to stage deleted files
152
+
153
+ Rewrite of "git add -i" in C that appeared in Git 2.25 didn't
154
+ correctly record a removed file to the index, which was fixed.
155
+ source: <pull.1273.git.1656454964378.gitgitgadget@gmail.com>
156
+
157
+--------------------------------------------------
158
+[Stalled]
159
+
160
+* ll/curl-accept-language (2022-06-13) 2 commits
161
+ - PREP??? give initializer to rpc_state
162
+ - remote-curl: send Accept-Language header to server
163
+
164
+ source: <pull.1251.v3.git.1655054421697.gitgitgadget@gmail.com>
165
+
166
+
167
+* bc/stash-export (2022-04-08) 4 commits
168
+ - builtin/stash: provide a way to import stashes from a ref
169
+ - builtin/stash: provide a way to export stashes to a ref
170
+ - builtin/stash: factor out revision parsing into a function
171
+ - object-name: make get_oid quietly return an error
172
+
173
+ A mechanism to export and import stash entries to and from a normal
174
+ commit to transfer it across repositories has been introduced.
175
+
176
+ Expecting a reroll.
177
+ cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
178
+ source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
179
+
180
+
181
+* cw/remote-object-info (2022-05-06) 11 commits
182
+ - SQUASH??? coccicheck
183
+ - SQUASH??? ensure that coccicheck is happy
184
+ - SQUASH??? compilation fix
185
+ - cat-file: add --batch-command remote-object-info command
186
+ - cat-file: move parse_cmd and DEFAULT_FORMAT up
187
+ - transport: add object-info fallback to fetch
188
+ - transport: add client side capability to request object-info
189
+ - object-info: send attribute packet regardless of object ids
190
+ - object-store: add function to free object_info contents
191
+ - fetch-pack: move fetch default settings
192
+ - fetch-pack: refactor packet writing
193
+
194
+ A client component to talk with the object-info endpoint.
195
+
196
+ Expecting a reroll.
197
+ source: <20220502170904.2770649-1-calvinwan@google.com>
198
+
199
+--------------------------------------------------
200
+[Cooking]
201
+
202
+* ds/git-rebase-doc-markup (2022-06-30) 1 commit
203
+ (merged to 'next' on 2022-07-08 at 24a0b80b71)
204
+ + git-rebase.txt: use back-ticks consistently
205
+
206
+ References to commands-to-be-typed-literally in "git rebase"
207
+ documentation mark-up have been corrected.
208
+
209
+ Will merge to 'master'.
210
source: <pull.1270.v3.git.1656508868146.gitgitgadget@gmail.com>
211
212
@@ -72,33 +224,26 @@ Release tarballs are available at:
224
"git rebase -i" learns to update branches whose tip appear in the
225
rebased range.
226
75
- Will merge to 'next'?
227
+ Expecting a reroll.
228
+ cf. <15631ea2-6722-fd24-c8a6-0cee638b0602@github.com>
229
source: <pull.1247.v3.git.1656422759.gitgitgadget@gmail.com>
230
231
232
* ds/vscode-settings (2022-06-27) 1 commit
80
- - vscode: improve tab size and wrapping
81
-
82
- source: <pull.1271.git.1656354587496.gitgitgadget@gmail.com>
83
-
84
-
85
-* js/add-i-delete (2022-06-28) 1 commit
86
- (merged to 'next' on 2022-06-28 at 8ac04bfd24)
87
- + add --interactive: allow `update` to stage deleted files
88
-
89
- Rewrite of "git add -i" in C that appeared in Git 2.25 didn't
90
- correctly record a removed file to the index, which was fixed.
233
+ (merged to 'next' on 2022-07-02 at fcbd2e7aca)
234
+ + vscode: improve tab size and wrapping
235
236
Will merge to 'master'.
93
- source: <pull.1273.git.1656454964378.gitgitgadget@gmail.com>
237
+ source: <pull.1271.git.1656354587496.gitgitgadget@gmail.com>
238
239
240
* tb/pack-objects-remove-pahole-comment (2022-06-28) 1 commit
97
- - pack-objects.h: remove outdated pahole results
241
+ (merged to 'next' on 2022-07-06 at d7494fbdef)
242
+ + pack-objects.h: remove outdated pahole results
243
244
Comment fix.
245
101
- Will merge to 'next'.
246
+ Will merge to 'master'.
247
source: <1379af2e9d271b501ef3942398e7f159a9c77973.1656440978.git.me@ttaylorr.com>
248
249
@@ -117,6 +262,7 @@ Release tarballs are available at:
262
263
Plug various memory leaks.
264
265
+ Will merge to 'next'.
266
source: <cover-v2-00.11-00000000000-20220701T104017Z-avarab@gmail.com>
267
268
@@ -133,15 +279,17 @@ Release tarballs are available at:
279
280
Plug various memory leaks in test-tool commands.
281
282
+ Will merge to 'next'.
283
source: <cover-v2-0.9-00000000000-20220701T103503Z-avarab@gmail.com>
284
285
286
* en/t6429-test-must-be-empty-fix (2022-06-30) 1 commit
140
- - t6429: fix use of non-existent function
287
+ (merged to 'next' on 2022-07-06 at 627c51773c)
288
+ + t6429: fix use of non-existent function
289
290
A test fix.
291
144
- Will merge to 'next'.
292
+ Will merge to 'master'.
293
source: <pull.1276.git.1656652799863.gitgitgadget@gmail.com>
294
295
@@ -158,50 +306,54 @@ Release tarballs are available at:
306
307
Another step to rewrite more parts of "git submodule" in C.
308
161
- Will merge to 'next'?
309
+ Will merge to 'next'.
310
source: <20220701021157.88858-1-chooglen@google.com>
311
312
313
* hx/lookup-commit-in-graph-fix (2022-06-30) 1 commit
166
- - commit-graph.c: no lazy fetch in lookup_commit_in_graph()
314
+ (merged to 'next' on 2022-07-08 at cef32db0b6)
315
+ + commit-graph.c: no lazy fetch in lookup_commit_in_graph()
316
317
A corner case bug where lazily fetching objects from a promisor
318
remote resulted in infinite recursion has been corrected.
319
171
- Will merge to 'next'.
320
+ Will merge to 'master'.
321
source: <96d4bb71505d87ed501c058bbd89bfc13d08b24a.1656593279.git.hanxin.hx@bytedance.com>
322
323
175
-* ll/ls-files-tests-update (2022-07-01) 1 commit
176
- - ls-files: update test style
324
+* ll/ls-files-tests-update (2022-07-06) 1 commit
325
+ (merged to 'next' on 2022-07-06 at 444d1eabd0)
326
+ + ls-files: update test style
327
328
Test update.
329
180
- Will merge to 'next'.
181
- source: <pull.1269.v5.git.1656673435357.gitgitgadget@gmail.com>
330
+ Will merge to 'master'.
331
+ source: <pull.1269.v6.git.1656863349926.gitgitgadget@gmail.com>
332
333
184
-* pw/xdiff-alloc (2022-06-30) 3 commits
334
+* pw/xdiff-alloc (2022-07-08) 4 commits
335
- xdiff: introduce XDL_ALLOC_GROW()
336
- xdiff: introduce XDL_CALLOC_ARRAY()
337
+ - xdiff: introduce xdl_calloc
338
- xdiff: introduce XDL_ALLOC_ARRAY()
339
340
Add a level of redirection to array allocation API in xdiff part,
341
to make it easier to share with the libgit2 project.
342
192
- Waiting for review responses.
193
- source: <pull.1272.git.1656516334.gitgitgadget@gmail.com>
343
+ Will merge to 'next'?
344
+ source: <pull.1272.v2.git.1657297519.gitgitgadget@gmail.com>
345
346
347
* sy/mv-out-of-cone (2022-07-01) 8 commits
197
- - mv: add check_dir_in_index() and solve general dir check issue
198
- - mv: use flags mode for update_mode
199
- - mv: check if <destination> exists in index to handle overwriting
200
- - mv: check if out-of-cone file exists in index with SKIP_WORKTREE bit
201
- - mv: decouple if/else-if checks using goto
202
- - mv: update sparsity after moving from out-of-cone to in-cone
203
- - t1092: mv directory from out-of-cone to in-cone
204
- - t7002: add tests for moving out-of-cone file/directory
348
+ (merged to 'next' on 2022-07-08 at 654970fdb7)
349
+ + mv: add check_dir_in_index() and solve general dir check issue
350
+ + mv: use flags mode for update_mode
351
+ + mv: check if <destination> exists in index to handle overwriting
352
+ + mv: check if out-of-cone file exists in index with SKIP_WORKTREE bit
353
+ + mv: decouple if/else-if checks using goto
354
+ + mv: update sparsity after moving from out-of-cone to in-cone
355
+ + t1092: mv directory from out-of-cone to in-cone
356
+ + t7002: add tests for moving out-of-cone file/directory
357
358
"git mv A B" in a sparsely populated working tree can be asked to
359
move a path between directories that are "in cone" (i.e. expected
@@ -209,46 +361,9 @@ Release tarballs are available at:
361
(i.e. expected to be hidden). The handling of such cases has been
362
improved.
363
212
- Will merge to 'next'.
364
+ Will merge to 'master'.
365
source: <20220630023737.473690-1-shaoxuan.yuan02@gmail.com>
366
215
---------------------------------------------------
216
-[Stalled]
217
-
218
-* bc/stash-export (2022-04-08) 4 commits
219
- - builtin/stash: provide a way to import stashes from a ref
220
- - builtin/stash: provide a way to export stashes to a ref
221
- - builtin/stash: factor out revision parsing into a function
222
- - object-name: make get_oid quietly return an error
223
-
224
- A mechanism to export and import stash entries to and from a normal
225
- commit to transfer it across repositories has been introduced.
226
-
227
- Expecting a reroll.
228
- cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
229
- source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
230
-
231
-
232
-* cw/remote-object-info (2022-05-06) 11 commits
233
- - SQUASH??? coccicheck
234
- - SQUASH??? ensure that coccicheck is happy
235
- - SQUASH??? compilation fix
236
- - cat-file: add --batch-command remote-object-info command
237
- - cat-file: move parse_cmd and DEFAULT_FORMAT up
238
- - transport: add object-info fallback to fetch
239
- - transport: add client side capability to request object-info
240
- - object-info: send attribute packet regardless of object ids
241
- - object-store: add function to free object_info contents
242
- - fetch-pack: move fetch default settings
243
- - fetch-pack: refactor packet writing
244
-
245
- A client component to talk with the object-info endpoint.
246
-
247
- Expecting a reroll.
248
- source: <20220502170904.2770649-1-calvinwan@google.com>
249
-
250
---------------------------------------------------
251
-[Cooking]
367
368
* ab/squelch-empty-fsync-traces (2022-06-30) 1 commit
369
. trace2: don't include "fsync" events in all trace2 logs
@@ -260,74 +375,82 @@ Release tarballs are available at:
375
376
377
* cl/grep-max-count (2022-06-22) 1 commit
263
- - grep: add --max-count command line option
378
+ (merged to 'next' on 2022-07-08 at 646199ab4c)
379
+ + grep: add --max-count command line option
380
381
"git grep -m<max-hits>" is a way to limit the hits shown per file.
382
267
- Will merge to 'next'.
383
+ Will merge to 'master'.
384
source: <pull.1278.v4.git.git.1655927252899.gitgitgadget@gmail.com>
385
386
387
* jk/revisions-doc-markup-fix (2022-06-22) 1 commit
272
- - revisions.txt: escape "..." to avoid asciidoc horizontal ellipsis
388
+ (merged to 'next' on 2022-07-02 at e25dbe8cfb)
389
+ + revisions.txt: escape "..." to avoid asciidoc horizontal ellipsis
390
391
Documentation mark-up fix.
392
276
- Will merge to 'next'.
393
+ Will merge to 'master'.
394
source: <YrOmsA04FZae89be@coredump.intra.peff.net>
395
396
397
* tk/rev-parse-doc-clarify-at-u (2022-06-23) 1 commit
281
- - rev-parse: documentation adjustment - mention remote tracking with @{u}
398
+ (merged to 'next' on 2022-07-08 at 1075452f32)
399
+ + rev-parse: documentation adjustment - mention remote tracking with @{u}
400
401
Doc update.
402
285
- Will merge to 'next'.
403
+ Will merge to 'master'.
404
source: <pull.1265.v2.git.1655960512385.gitgitgadget@gmail.com>
405
406
407
* en/merge-tree (2022-06-22) 17 commits
290
- - git-merge-tree.txt: add a section on potentional usage mistakes
291
- - merge-tree: add a --allow-unrelated-histories flag
292
- - merge-tree: allow `ls-files -u` style info to be NUL terminated
293
- - merge-ort: optionally produce machine-readable output
294
- - merge-ort: store more specific conflict information
295
- - merge-ort: make `path_messages` a strmap to a string_list
296
- - merge-ort: store messages in a list, not in a single strbuf
297
- - merge-tree: provide easy access to `ls-files -u` style info
298
- - merge-tree: provide a list of which files have conflicts
299
- - merge-ort: remove command-line-centric submodule message from merge-ort
300
- - merge-ort: provide a merge_get_conflicted_files() helper function
301
- - merge-tree: support including merge messages in output
302
- - merge-ort: split out a separate display_update_messages() function
303
- - merge-tree: implement real merges
304
- - merge-tree: add option parsing and initial shell for real merge function
305
- - merge-tree: move logic for existing merge into new function
306
- - merge-tree: rename merge_trees() to trivial_merge_trees()
408
+ (merged to 'next' on 2022-07-08 at a29b4896ab)
409
+ + git-merge-tree.txt: add a section on potentional usage mistakes
410
+ + merge-tree: add a --allow-unrelated-histories flag
411
+ + merge-tree: allow `ls-files -u` style info to be NUL terminated
412
+ + merge-ort: optionally produce machine-readable output
413
+ + merge-ort: store more specific conflict information
414
+ + merge-ort: make `path_messages` a strmap to a string_list
415
+ + merge-ort: store messages in a list, not in a single strbuf
416
+ + merge-tree: provide easy access to `ls-files -u` style info
417
+ + merge-tree: provide a list of which files have conflicts
418
+ + merge-ort: remove command-line-centric submodule message from merge-ort
419
+ + merge-ort: provide a merge_get_conflicted_files() helper function
420
+ + merge-tree: support including merge messages in output
421
+ + merge-ort: split out a separate display_update_messages() function
422
+ + merge-tree: implement real merges
423
+ + merge-tree: add option parsing and initial shell for real merge function
424
+ + merge-tree: move logic for existing merge into new function
425
+ + merge-tree: rename merge_trees() to trivial_merge_trees()
426
427
A new command is introduced that takes two commits and computes a
428
tree that would be contained in the resulting merge commit, if the
429
histories leading to these two commits were to be merged, and is
430
added as a new mode of "git merge-tree" subcommand.
431
313
- Will merge to 'next'.
432
+ Will merge to 'master'.
433
source: <pull.1122.v7.git.1655511660.gitgitgadget@gmail.com>
434
435
436
* dr/i18n-die-warn-error-usage (2022-06-21) 1 commit
318
- - i18n: mark message helpers prefix for translation
437
+ (merged to 'next' on 2022-07-08 at 6f639750a1)
438
+ + i18n: mark message helpers prefix for translation
439
320
- Give _() markings to fatal/warning/usage: that is shown in front of
321
- these messages.
440
+ Give _() markings to fatal/warning/usage: labels that are shown in
441
+ front of these messages.
442
323
- Will merge to 'next'.
443
+ Will merge to 'master'.
444
source: <pull.1279.v2.git.git.1655819877758.gitgitgadget@gmail.com>
445
446
447
* ds/t5510-brokequote (2022-06-21) 1 commit
328
- - t5510: replace 'origin' with URL more carefully
448
+ (merged to 'next' on 2022-07-06 at 2776bed385)
449
+ + t5510: replace 'origin' with URL more carefully
450
451
Test fix.
452
+
453
+ Will merge to 'master'.
454
source: <484a330e-0902-6e1b-8189-63c72dcea494@github.com>
455
456
@@ -348,13 +471,14 @@ Release tarballs are available at:
471
472
473
* rs/combine-diff-with-incompatible-options (2022-06-21) 2 commits
351
- - combine-diff: abort if --output is given
352
- - combine-diff: abort if --ignore-matching-lines is given
474
+ (merged to 'next' on 2022-07-02 at 0fe8b80a3e)
475
+ + combine-diff: abort if --output is given
476
+ + combine-diff: abort if --ignore-matching-lines is given
477
478
Certain diff options are currently ignored when combined-diff is
479
shown; mark them as incompatible with the feature.
480
357
- Will merge to 'next'.
481
+ Will merge to 'master'.
482
source: <220524.86v8tuvfl1.gmgdl@evledraar.gmail.com>
483
484
@@ -370,29 +494,30 @@ Release tarballs are available at:
494
source: <pull.1257.v2.git.1655655027.gitgitgadget@gmail.com>
495
496
373
-* zh/ls-files-format (2022-06-27) 1 commit
497
+* zh/ls-files-format (2022-07-06) 1 commit
498
- ls-files: introduce "--format" option
499
500
"git ls-files" learns the "--format" option to tweak its output.
501
378
- Expecting a reroll.
379
- cf. <CAOLTT8Tc95-aUE+uN2d8QjTJpGpGw6cBJfG+bpmyE55OcXTSRA@mail.gmail.com>
380
- source: <pull.1262.v4.git.1656257376109.gitgitgadget@gmail.com>
502
+ Getting closer to finish?
503
+ cf. <220705.86sfng9c5a.gmgdl@evledraar.gmail.com>
504
+ source: <pull.1262.v5.git.1657002760815.gitgitgadget@gmail.com>
505
506
507
* ab/test-quoting-fix (2022-06-30) 3 commits
384
- - config tests: fix harmless but broken "rm -r" cleanup
385
- - test-lib.sh: fix prepend_var() quoting issue
386
- - tests: add missing double quotes to included library paths
508
+ (merged to 'next' on 2022-07-06 at 0aa78fd9db)
509
+ + config tests: fix harmless but broken "rm -r" cleanup
510
+ + test-lib.sh: fix prepend_var() quoting issue
511
+ + tests: add missing double quotes to included library paths
512
513
Fixes for tests when the source directory has unusual characters in
514
its path, e.g. whitespaces, double-quotes, etc.
515
391
- Will merge to 'next'.
516
+ Will merge to 'master'.
517
source: <cover-v2-0.3-00000000000-20220630T101646Z-avarab@gmail.com>
518
519
395
-* en/merge-dual-dir-renames-fix (2022-06-30) 5 commits
520
+* en/merge-dual-dir-renames-fix (2022-07-06) 5 commits
521
- merge-ort: fix issue with dual rename and add/add conflict
522
- merge-ort: shuffle the computation and cleanup of potential collisions
523
- merge-ort: make a separate function for freeing struct collisions
@@ -402,8 +527,8 @@ Release tarballs are available at:
527
Fixes a long-standing corner case bug around directory renames in
528
the merge-ort strategy.
529
405
- Will merge to 'next'?
406
- source: <pull.1268.v3.git.1656653000.gitgitgadget@gmail.com>
530
+ Will merge to 'next'.
531
+ source: <pull.1268.v4.git.1656984823.gitgitgadget@gmail.com>
532
533
534
* cr/setup-bug-typo (2022-06-17) 1 commit
@@ -417,25 +542,27 @@ Release tarballs are available at:
542
543
544
* zk/push-use-bitmaps (2022-06-17) 1 commit
420
- - send-pack.c: add config push.useBitmaps
545
+ (merged to 'next' on 2022-07-08 at 8aa1f94fad)
546
+ + send-pack.c: add config push.useBitmaps
547
548
"git push" sometimes perform poorly when reachability bitmaps are
549
used, even in a repository where other operations are helped by
550
bitmaps. The push.useBitmaps configuration variable is introduced
551
to allow disabling use of reachability bitmaps only for "git push".
552
427
- Will merge to 'next'.
553
+ Will merge to 'master'.
554
source: <pull.1263.v4.git.1655492779228.gitgitgadget@gmail.com>
555
556
557
* jk/remote-show-with-negative-refspecs (2022-06-17) 1 commit
432
- - remote: handle negative refspecs in git remote show
558
+ (merged to 'next' on 2022-07-08 at d4e49ad22a)
559
+ + remote: handle negative refspecs in git remote show
560
(this branch is used by jk/t5505-restructure.)
561
562
"git remote show [-n] frotz" now pays attention to negative
563
pathspecs.
564
438
- Will merge to 'next'.
565
+ Will merge to 'master'.
566
source: <20220617002036.1577-2-jacob.keller@gmail.com>
567
568
@@ -458,27 +585,26 @@ Release tarballs are available at:
585
586
587
* ro/mktree-allow-missing-fix (2022-06-21) 1 commit
461
- - mktree: do not check type of remote objects
588
+ (merged to 'next' on 2022-07-08 at 599ed6fb84)
589
+ + mktree: do not check type of remote objects
590
591
"git mktree --missing" lazily fetched objects that are missing from
464
- the local object store, which was totally unnecessary.
592
+ the local object store, which was totally unnecessary for the purpose
593
+ of creating the tree object(s) from its input.
594
466
- Will merge to 'next'.
595
+ Will merge to 'master'.
596
source: <748f39a9-65aa-2110-cf92-7ddf81b5f507@roku.com>
597
598
470
-* ll/curl-accept-language (2022-06-13) 2 commits
471
- - PREP??? give initializer to rpc_state
472
- - remote-curl: send Accept-Language header to server
473
-
474
- source: <pull.1251.v3.git.1655054421697.gitgitgadget@gmail.com>
475
-
476
-
599
* pb/diff-doc-raw-format (2022-06-13) 3 commits
478
- - diff-index.txt: update raw output format in examples
479
- - diff-format.txt: correct misleading wording
480
- - diff-format.txt: dst can be 0* SHA-1 when path is deleted, too
600
+ (merged to 'next' on 2022-07-02 at 198480cbc6)
601
+ + diff-index.txt: update raw output format in examples
602
+ + diff-format.txt: correct misleading wording
603
+ + diff-format.txt: dst can be 0* SHA-1 when path is deleted, too
604
605
+ Update "git diff/log --raw" format documentation.
606
+
607
+ Will merge to 'master'.
608
source: <pull.1259.git.1655123383.gitgitgadget@gmail.com>
609
610
@@ -534,23 +660,24 @@ Release tarballs are available at:
660
661
662
* ab/submodule-cleanup (2022-06-28) 12 commits
537
- - git-sh-setup.sh: remove "say" function, change last users
538
- - git-submodule.sh: use "$quiet", not "$GIT_QUIET"
539
- - submodule--helper: eliminate internal "--update" option
540
- - submodule--helper: understand --checkout, --merge and --rebase synonyms
541
- - submodule--helper: report "submodule" as our name in some "-h" output
542
- - submodule--helper: rename "absorb-git-dirs" to "absorbgitdirs"
543
- - submodule update: remove "-v" option
544
- - submodule--helper: have --require-init imply --init
545
- - git-submodule.sh: remove unused top-level "--branch" argument
546
- - git-submodule.sh: make the "$cached" variable a boolean
547
- - git-submodule.sh: remove unused $prefix variable
548
- - git-submodule.sh: remove unused sanitize_submodule_env()
663
+ (merged to 'next' on 2022-07-08 at 6f3886aa03)
664
+ + git-sh-setup.sh: remove "say" function, change last users
665
+ + git-submodule.sh: use "$quiet", not "$GIT_QUIET"
666
+ + submodule--helper: eliminate internal "--update" option
667
+ + submodule--helper: understand --checkout, --merge and --rebase synonyms
668
+ + submodule--helper: report "submodule" as our name in some "-h" output
669
+ + submodule--helper: rename "absorb-git-dirs" to "absorbgitdirs"
670
+ + submodule update: remove "-v" option
671
+ + submodule--helper: have --require-init imply --init
672
+ + git-submodule.sh: remove unused top-level "--branch" argument
673
+ + git-submodule.sh: make the "$cached" variable a boolean
674
+ + git-submodule.sh: remove unused $prefix variable
675
+ + git-submodule.sh: remove unused sanitize_submodule_env()
676
(this branch is used by gc/submodule-use-super-prefix.)
677
678
Further preparation to turn git-submodule.sh into a builtin.
679
553
- Will merge to 'next'.
680
+ Will merge to 'master'.
681
source: <cover-v4-00.12-00000000000-20220628T095914Z-avarab@gmail.com>
682
683
@@ -576,6 +703,8 @@ Release tarballs are available at:
703
- gitweb/Makefile: define all .PHONY prerequisites inline
704
705
Teach "make all" to build gitweb as well.
706
+
707
+ Will merge to 'next'?
708
source: <cover-v3-0.8-00000000000-20220628T100936Z-avarab@gmail.com>
709
710
@@ -609,18 +738,19 @@ Release tarballs are available at:
738
739
740
* hx/unpack-streaming (2022-06-13) 6 commits
612
- - unpack-objects: use stream_loose_object() to unpack large objects
613
- - core doc: modernize core.bigFileThreshold documentation
614
- - object-file.c: add "stream_loose_object()" to handle large object
615
- - object-file.c: factor out deflate part of write_loose_object()
616
- - object-file.c: refactor write_loose_object() to several steps
617
- - unpack-objects: low memory footprint for get_data() in dry_run mode
741
+ (merged to 'next' on 2022-07-08 at 4eb375ec2f)
742
+ + unpack-objects: use stream_loose_object() to unpack large objects
743
+ + core doc: modernize core.bigFileThreshold documentation
744
+ + object-file.c: add "stream_loose_object()" to handle large object
745
+ + object-file.c: factor out deflate part of write_loose_object()
746
+ + object-file.c: refactor write_loose_object() to several steps
747
+ + unpack-objects: low memory footprint for get_data() in dry_run mode
748
749
Allow large objects read from a packstream to be streamed into a
750
loose object file straight, without having to keep it in-core as a
751
whole.
752
623
- Will merge to 'next'.
753
+ Will merge to 'master'.
754
source: <cover.1654914555.git.chiyutianyi@gmail.com>
755
756
@@ -669,10 +799,13 @@ Release tarballs are available at:
799
- bisect: verify that a bogus option won't try to start a bisection
800
801
Final bits of "git bisect.sh" have been rewritten in C.
802
+
803
+ Expecting a (hopefully final) reroll.
804
+ cf. <20627.86ilolhnnn.gmgdl@evledraar.gmail.com>
805
source: <pull.1132.v4.git.1656354677.gitgitgadget@gmail.com>
806
807
675
-* gc/bare-repo-discovery (2022-06-30) 5 commits
808
+* gc/bare-repo-discovery (2022-07-07) 5 commits
809
- setup.c: create `discovery.bare`
810
- safe.directory: use git_protected_config()
811
- config: learn `git_protected_config()`
@@ -681,35 +814,33 @@ Release tarballs are available at:
814
815
Introduce a discovery.barerepository configuration variable that
816
allows users to forbid discovery of bare repositories.
684
-
685
- Will merge to 'next'?
686
- source: <pull.1261.v6.git.git.1656612839.gitgitgadget@gmail.com>
817
+ source: <pull.1261.v7.git.git.1657234914.gitgitgadget@gmail.com>
818
819
820
* gg/worktree-from-the-above (2022-06-21) 2 commits
690
- - dir: minor refactoring / clean-up
691
- - dir: traverse into repository
821
+ (merged to 'next' on 2022-07-08 at fa0e71ba39)
822
+ + dir: minor refactoring / clean-up
823
+ + dir: traverse into repository
824
693
- With a non-bare repository, with core.worktree pointing at a
694
- directory that has the repository as its subdirectory, regressed in
695
- Git 2.27 days.
825
+ In a non-bare repository, the behavior of Git when the
826
+ core.worktree configuration variable points at a directory that has
827
+ a repository as its subdirectory, regressed in Git 2.27 days.
828
697
- Will merge to 'next'.
829
+ Will merge to 'master'.
830
source: <20220616234433.225-1-gg.oss@outlook.com>
831
source: <20220616231956.154-1-gg.oss@outlook.com>
832
833
+--------------------------------------------------
834
+[Discarded]
835
836
* ar/send-email-confirm-by-default (2022-04-22) 1 commit
703
- - send-email: always confirm by default
837
+ . send-email: always confirm by default
838
839
"git send-email" is changed so that by default it asks for
840
confirmation before sending each message out.
841
708
- Will discard.
709
-
842
+ Discarded.
843
I wanted to like this, and had it in the version of Git I use
844
myself for daily work, but the prompting turned out to be somewhat
845
distracting.
713
-
714
- Thoughts?
846
source: <20220422083629.1404989-1-hi@alyssa.is>