What's cooking (2022/07 #03)
Junio C Hamano committed
Jul 11, 2022 at 18:23 UTC
77ce05638ff467ab0b17b7d31fe48fe7c206a07e
2 files changed
+305
-258
cook
-1
@@ -422,7 +422,6 @@ EOF
422
423
$text = <<EOF;
424
To: git\@vger.kernel.org
425
-Bcc: lwn\@lwn.net
425
Subject: What's cooking in git.git ($mon $year, #$issue; $dow, $date)
426
X-$MASTER-at: $master_at
427
X-next-at: $next_at
whats-cooking.txt
+305
-257
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2022, #02; Fri, 8)
3
-X-master-at: 30cc8d0f147546d4dd77bf497f4dec51e7265bd8
4
-X-next-at: cef32db0b66f484ee602159300027f9396ab5473
2
+Subject: What's cooking in git.git (Jul 2022, #03; Mon, 11)
3
+X-master-at: f2e5255fc2d3a043f37e259012e1ccd013d6e4b8
4
+X-next-at: 0f90570f4190085940668d388fe346adefe9cb5d
5
6
-What's cooking in git.git (Jul 2022, #02; Fri, 8)
6
+What's cooking in git.git (Jul 2022, #03; Mon, 11)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -12,6 +12,8 @@ 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
+Maintenance releases v2.37.1 and others have been tagged.
16
+
17
Copies of the source code to Git live in many repositories, and the
18
following is a list of the ones I push into or their mirrors. Some
19
repositories have only a subset of branches.
@@ -41,127 +43,166 @@ Release tarballs are available at:
43
https://www.kernel.org/pub/software/scm/git/
44
45
--------------------------------------------------
44
-[New Topics]
46
+[Graduated to 'master']
47
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
48
+* ac/bitmap-format-doc (2022-06-16) 3 commits
49
+ (merged to 'next' on 2022-06-16 at 5591d11601)
50
+ + bitmap-format.txt: add information for trailing checksum
51
+ + bitmap-format.txt: fix some formatting issues
52
+ + bitmap-format.txt: feed the file to asciidoc to generate html
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.
54
+ Adjust technical/bitmap-format to be formatted by AsciiDoc, and
55
+ add some missing information to the documentation.
56
+ source: <pull.1246.v4.git.1655355834.gitgitgadget@gmail.com>
57
59
- Will merge to 'next'.
60
- source: <cover-v4-0.6-00000000000-20220705T134033Z-avarab@gmail.com>
58
59
+* cr/setup-bug-typo (2022-06-17) 1 commit
60
+ (merged to 'next' on 2022-06-17 at 8834ffe0ab)
61
+ + setup: fix function name in a BUG() message
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
63
+ Typofix in a BUG() message.
64
+ source: <pull.1255.git.1654782920256.gitgitgadget@gmail.com>
65
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.
66
72
- Will merge to 'next'?
73
- source: <YsdyLS4UFzj0j/wB@coredump.intra.peff.net>
67
+* ds/branch-checked-out (2022-06-21) 7 commits
68
+ (merged to 'next' on 2022-06-21 at e42bc4566f)
69
+ + branch: drop unused worktrees variable
70
+ + fetch: stop passing around unused worktrees variable
71
+ (merged to 'next' on 2022-06-17 at c881874257)
72
+ + branch: fix branch_checked_out() leaks
73
+ + branch: use branch_checked_out() when deleting refs
74
+ + fetch: use new branch_checked_out() and add tests
75
+ + branch: check for bisects and rebases
76
+ + branch: add branch_checked_out() helper
77
+ (this branch is used by ds/rebase-update-ref.)
78
+
79
+ Introduce a helper to see if a branch is already being worked on
80
+ (hence should not be newly checked out in a working tree), which
81
+ performs much better than the existing find_shared_symref() to
82
+ replace many uses of the latter.
83
+ source: <pull.1254.v2.git.1655234853.gitgitgadget@gmail.com>
84
85
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
86
+* ds/vscode-settings (2022-06-27) 1 commit
87
+ (merged to 'next' on 2022-07-02 at fcbd2e7aca)
88
+ + vscode: improve tab size and wrapping
89
84
- The pack bitmap file gained a bitmap-lookup table to speed up
85
- locating the necessary bitmap for a given commit.
90
+ Will merge to 'master'.
91
+ source: <pull.1271.git.1656354587496.gitgitgadget@gmail.com>
92
87
- Will merge to 'next'?
88
- source: <pull.1266.v3.git.1656924376.gitgitgadget@gmail.com>
93
94
+* jk/optim-promisor-object-enumeration (2022-06-16) 1 commit
95
+ (merged to 'next' on 2022-06-16 at ce0712a74c)
96
+ + is_promisor_object(): walk promisor packs in pack-order
97
91
-* bc/nettle-sha256 (2022-07-07) 1 commit
92
- - sha256: add support for Nettle
98
+ Collection of what is referenced by objects in promisor packs have
99
+ been optimized to inspect these objects in the in-pack order.
100
+ source: <YqrTsbXbEjx0Pabn@coredump.intra.peff.net>
101
94
- Support for libnettle as SHA256 implementation has been added.
102
96
- Expecting a reroll.
97
- cf. <YsTgmv+h2SFFFMga@tapette.crustytoothpaste.net>
98
- source: <20220705230518.713218-1-sandals@crustytoothpaste.net>
103
+* jk/revisions-doc-markup-fix (2022-06-22) 1 commit
104
+ (merged to 'next' on 2022-07-02 at e25dbe8cfb)
105
+ + revisions.txt: escape "..." to avoid asciidoc horizontal ellipsis
106
107
+ Documentation mark-up fix.
108
+ source: <YrOmsA04FZae89be@coredump.intra.peff.net>
109
101
-* jc/builtin-mv-move-array (2022-07-06) 1 commit
102
- - builtin/mv.c: use the MOVE_ARRAY() macro instead of memmove()
110
104
- Apply Coccinelle rule to turn raw memmove() into MOVE_ARRAY() cpp
105
- macro, which would improve maintainability and readability.
111
+* pb/diff-doc-raw-format (2022-06-13) 3 commits
112
+ (merged to 'next' on 2022-07-02 at 198480cbc6)
113
+ + diff-index.txt: update raw output format in examples
114
+ + diff-format.txt: correct misleading wording
115
+ + diff-format.txt: dst can be 0* SHA-1 when path is deleted, too
116
107
- Will merge to 'next'?
108
- source: <xmqqy1x531vp.fsf@gitster.g>
117
+ Update "git diff/log --raw" format documentation.
118
+ source: <pull.1259.git.1655123383.gitgitgadget@gmail.com>
119
120
111
-* jd/gpg-interface-trust-level-string (2022-07-08) 1 commit
112
- - gpg-interface: add function for converting trust level to string
121
+* rs/archive-with-internal-gzip (2022-06-15) 6 commits
122
+ (merged to 'next' on 2022-06-17 at ab5af6acd1)
123
+ + archive-tar: use internal gzip by default
124
+ + archive-tar: use OS_CODE 3 (Unix) for internal gzip
125
+ + archive-tar: add internal gzip implementation
126
+ + archive-tar: factor out write_block()
127
+ + archive: rename archiver data field to filter_command
128
+ + archive: update format documentation
129
114
- The code to convert between GPG trust level strings and internal
115
- constants we use to represent them have been cleaned up.
130
+ Teach "git archive" to (optionally and then by default) avoid
131
+ spawning an external "gzip" process when creating ".tar.gz" (and
132
+ ".tgz") archives.
133
+ source: <9df761c3-355a-ede9-7971-b32687fe9abb@web.de>
134
117
- Will merge to 'next'.
118
- source: <pull.1281.v2.git.1657279447515.gitgitgadget@gmail.com>
135
136
+* rs/combine-diff-with-incompatible-options (2022-06-21) 2 commits
137
+ (merged to 'next' on 2022-07-02 at 0fe8b80a3e)
138
+ + combine-diff: abort if --output is given
139
+ + combine-diff: abort if --ignore-matching-lines is given
140
121
-* kk/p4-client-name-encoding-fix (2022-07-08) 1 commit
122
- - git-p4: fix bug with encoding of p4 client name
141
+ Certain diff options are currently ignored when combined-diff is
142
+ shown; mark them as incompatible with the feature.
143
+ source: <220524.86v8tuvfl1.gmgdl@evledraar.gmail.com>
144
124
- "git p4" did not handle non-ASCII client name well, which has been
125
- corrected.
145
+--------------------------------------------------
146
+[New Topics]
147
127
- Will merge to 'next'.
128
- source: <pull.1285.git.git.1657267260405.gitgitgadget@gmail.com>
148
+* po/doc-add-renormalize (2022-07-09) 1 commit
149
+ - doc add: renormalize is not idempotent for CRCRLF
150
151
+ Documentation for "git add --renormalize" has been improved.
152
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()
153
+ Will merge to 'next'?
154
+ source: <d3b8ed97a105ea1d7e656c964b7eee378e11ede6.1657385781.git.gitgitgadget@gmail.com>
155
138
- source: <20220707161554.6900-1-siddharthasthana31@gmail.com>
156
157
+* po/glossary-around-traversal (2022-07-09) 3 commits
158
+ - glossary: add reachability bitmap description
159
+ - glossary: add commit graph description
160
+ - glossary: add Object DataBase (ODB) abbreviation
161
141
-* fr/vimdiff-layout-fix (2022-07-08) 1 commit
142
- - vimdiff: make layout engine more robust against user vim settings
162
+ The glossary entries for "commit-graph file" and "reachability
163
+ bitmap" have been added.
164
144
- source: <20220708181024.45839-1-greenfoo@u92.eu>
165
+ Will merge to 'next'?
166
+ source: <pull.1282.git.1657385781.gitgitgadget@gmail.com>
167
146
---------------------------------------------------
147
-[Graduated to 'master']
168
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
169
+* rs/cocci-array-copy (2022-07-10) 1 commit
170
+ - cocci: avoid normalization rules for memcpy
171
+
172
+ A coccinelle rule (in contrib/) to encourage use of COPY_ARRAY
173
+ macro has been improved.
174
+
175
+ Will merge to 'next'.
176
+ source: <ded153d4-4aea-d4da-11cb-ec66d181e4c9@web.de>
177
+
178
+
179
+* sg/multi-pack-index-parse-options-fix (2022-07-10) 1 commit
180
+ (merged to 'next' on 2022-07-11 at 1e14685680)
181
+ + multi-pack-index: simplify handling of unknown --options
182
+
183
+ The way "git multi-pack" uses parse-options API has been improved.
184
+
185
+ Will merge to 'master'.
186
+ source: <20220710151645.GA2038@szeder.dev>
187
+
188
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>
189
+* jk/ref-filter-discard-commit-buffer (2022-07-11) 1 commit
190
+ - ref-filter: disable save_commit_buffer while traversing
191
+
192
+ source: <Ysw4JtoHW1vWmqhz@coredump.intra.peff.net>
193
194
--------------------------------------------------
195
[Stalled]
196
160
-* ll/curl-accept-language (2022-06-13) 2 commits
161
- - PREP??? give initializer to rpc_state
197
+* ll/curl-accept-language (2022-07-11) 1 commit
198
- remote-curl: send Accept-Language header to server
199
164
- source: <pull.1251.v3.git.1655054421697.gitgitgadget@gmail.com>
200
+ Earlier, HTTP transport clients learned to tell the server side
201
+ what locale they are in by sending Accept-Language HTTP header, but
202
+ this was done only for some requests but not others.
203
+
204
+ Will merge to 'next'.
205
+ source: <pull.1251.v4.git.1657519134336.gitgitgadget@gmail.com>
206
207
208
* bc/stash-export (2022-04-08) 4 commits
@@ -199,6 +240,119 @@ Release tarballs are available at:
240
--------------------------------------------------
241
[Cooking]
242
243
+* ab/cocci-unused (2022-07-06) 6 commits
244
+ (merged to 'next' on 2022-07-11 at 7fa60d2a5b)
245
+ + cocci: generalize "unused" rule to cover more than "strbuf"
246
+ + cocci: add and apply a rule to find "unused" strbufs
247
+ + cocci: have "coccicheck{,-pending}" depend on "coccicheck-test"
248
+ + cocci: add a "coccicheck-test" target and test *.cocci rules
249
+ + Makefile & .gitignore: ignore & clean "git.res", not "*.res"
250
+ + Makefile: remove mandatory "spatch" arguments from SPATCH_FLAGS
251
+
252
+ Add Coccinelle rules to detect the pattern of initializing and then
253
+ finalizing a structure without using it in between at all, which
254
+ happens after code restructuring and the compilers fail to
255
+ recognize as an unused varilable.
256
+
257
+ Will merge to 'master'.
258
+ source: <cover-v4-0.6-00000000000-20220705T134033Z-avarab@gmail.com>
259
+
260
+
261
+* jk/clone-unborn-confusion (2022-07-11) 4 commits
262
+ - clone: move unborn head creation to update_head()
263
+ - clone: use remote branch if it matches default HEAD
264
+ - clone: propagate empty remote HEAD even with other branches
265
+ - clone: drop extra newline from warning message
266
+
267
+ "git clone" from a repository with some ref whose HEAD is unborn
268
+ did not set the HEAD in the resulting repository correctly, which
269
+ has been corrected.
270
+
271
+ Will merge to 'next'.
272
+ source: <YsdyLS4UFzj0j/wB@coredump.intra.peff.net>
273
+ source: <YsvrsOH1jg559yVt@coredump.intra.peff.net>
274
+
275
+
276
+* ac/bitmap-lookup-table (2022-07-06) 6 commits
277
+ - p5310-pack-bitmaps.sh: remove pack.writeReverseIndex
278
+ - bitmap-lookup-table: add performance tests for lookup table
279
+ - pack-bitmap: prepare to read lookup table extension
280
+ - pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests
281
+ - pack-bitmap-write.c: write lookup table extension
282
+ - Documentation/technical: describe bitmap lookup table extension
283
+
284
+ The pack bitmap file gained a bitmap-lookup table to speed up
285
+ locating the necessary bitmap for a given commit.
286
+
287
+ Will merge to 'next'?
288
+ source: <pull.1266.v3.git.1656924376.gitgitgadget@gmail.com>
289
+
290
+
291
+* bc/nettle-sha256 (2022-07-10) 1 commit
292
+ (merged to 'next' on 2022-07-11 at cf9595d8ca)
293
+ + sha256: add support for Nettle
294
+
295
+ Support for libnettle as SHA256 implementation has been added.
296
+
297
+ Will merge to 'master'.
298
+ source: <20220710132907.1499365-1-sandals@crustytoothpaste.net>
299
+
300
+
301
+* jc/builtin-mv-move-array (2022-07-09) 1 commit
302
+ (merged to 'next' on 2022-07-09 at 0d3b3f62e5)
303
+ + builtin/mv.c: use the MOVE_ARRAY() macro instead of memmove()
304
+
305
+ Apply Coccinelle rule to turn raw memmove() into MOVE_ARRAY() cpp
306
+ macro, which would improve maintainability and readability.
307
+
308
+ Will merge to 'master'.
309
+ source: <xmqq4jzpu4xp.fsf_-_@gitster.g>
310
+
311
+
312
+* jd/gpg-interface-trust-level-string (2022-07-10) 1 commit
313
+ (merged to 'next' on 2022-07-11 at 7b3cca73a8)
314
+ + gpg-interface: add function for converting trust level to string
315
+
316
+ The code to convert between GPG trust level strings and internal
317
+ constants we use to represent them have been cleaned up.
318
+
319
+ Will merge to 'master'.
320
+ source: <pull.1281.v4.git.1657515650587.gitgitgadget@gmail.com>
321
+
322
+
323
+* kk/p4-client-name-encoding-fix (2022-07-08) 1 commit
324
+ (merged to 'next' on 2022-07-11 at 9c18616f76)
325
+ + git-p4: fix bug with encoding of p4 client name
326
+
327
+ "git p4" did not handle non-ASCII client name well, which has been
328
+ corrected.
329
+
330
+ Will merge to 'master'.
331
+ source: <pull.1285.git.git.1657267260405.gitgitgadget@gmail.com>
332
+
333
+
334
+* sa/cat-file-mailmap (2022-07-09) 4 commits
335
+ - cat-file: add mailmap support
336
+ - ident: rename commit_rewrite_person() to apply_mailmap_to_header()
337
+ - ident: move commit_rewrite_person() to ident.c
338
+ - revision: improve commit_rewrite_person()
339
+
340
+ "git cat-file" learned an option to use the mailmap when showing
341
+ commit and tag objects.
342
+ source: <20220709154149.165524-1-siddharthasthana31@gmail.com>
343
+
344
+
345
+* fr/vimdiff-layout-fix (2022-07-08) 1 commit
346
+ (merged to 'next' on 2022-07-09 at d8461bd236)
347
+ + vimdiff: make layout engine more robust against user vim settings
348
+
349
+ Recent update to vimdiff layout code has been made more robust
350
+ against different end-user vim settings.
351
+
352
+ Will merge to 'master'.
353
+ source: <20220708181024.45839-1-greenfoo@u92.eu>
354
+
355
+
356
* ds/git-rebase-doc-markup (2022-06-30) 1 commit
357
(merged to 'next' on 2022-07-08 at 24a0b80b71)
358
+ git-rebase.txt: use back-ticks consistently
@@ -219,7 +373,6 @@ Release tarballs are available at:
373
- rebase-interactive: update 'merge' description
374
- branch: consider refs under 'update-refs'
375
- t2407: test branches currently using apply backend
222
- (this branch uses ds/branch-checked-out.)
376
377
"git rebase -i" learns to update branches whose tip appear in the
378
rebased range.
@@ -229,14 +382,6 @@ Release tarballs are available at:
382
source: <pull.1247.v3.git.1656422759.gitgitgadget@gmail.com>
383
384
232
-* ds/vscode-settings (2022-06-27) 1 commit
233
- (merged to 'next' on 2022-07-02 at fcbd2e7aca)
234
- + vscode: improve tab size and wrapping
235
-
236
- Will merge to 'master'.
237
- source: <pull.1271.git.1656354587496.gitgitgadget@gmail.com>
238
-
239
-
385
* tb/pack-objects-remove-pahole-comment (2022-06-28) 1 commit
386
(merged to 'next' on 2022-07-06 at d7494fbdef)
387
+ pack-objects.h: remove outdated pahole results
@@ -248,38 +393,40 @@ Release tarballs are available at:
393
394
395
* ab/leakfix (2022-07-01) 11 commits
251
- - pull: fix a "struct oid_array" memory leak
252
- - cat-file: fix a common "struct object_context" memory leak
253
- - gc: fix a memory leak
254
- - checkout: avoid "struct unpack_trees_options" leak
255
- - merge-file: fix memory leaks on error path
256
- - merge-file: refactor for subsequent memory leak fix
257
- - cat-file: fix a memory leak in --batch-command mode
258
- - revert: free "struct replay_opts" members
259
- - submodule.c: free() memory from xgetcwd()
260
- - clone: fix memory leak in wanted_peer_refs()
261
- - check-ref-format: fix trivial memory leak
396
+ (merged to 'next' on 2022-07-11 at 0b107fffcf)
397
+ + pull: fix a "struct oid_array" memory leak
398
+ + cat-file: fix a common "struct object_context" memory leak
399
+ + gc: fix a memory leak
400
+ + checkout: avoid "struct unpack_trees_options" leak
401
+ + merge-file: fix memory leaks on error path
402
+ + merge-file: refactor for subsequent memory leak fix
403
+ + cat-file: fix a memory leak in --batch-command mode
404
+ + revert: free "struct replay_opts" members
405
+ + submodule.c: free() memory from xgetcwd()
406
+ + clone: fix memory leak in wanted_peer_refs()
407
+ + check-ref-format: fix trivial memory leak
408
409
Plug various memory leaks.
410
265
- Will merge to 'next'.
411
+ Will merge to 'master'.
412
source: <cover-v2-00.11-00000000000-20220701T104017Z-avarab@gmail.com>
413
414
415
* ab/test-tool-leakfix (2022-07-01) 9 commits
270
- - test-tool delta: fix a memory leak
271
- - test-tool ref-store: fix a memory leak
272
- - test-tool bloom: fix memory leaks
273
- - test-tool json-writer: fix memory leaks
274
- - test-tool regex: call regfree(), fix memory leaks
275
- - test-tool urlmatch-normalization: fix a memory leak
276
- - test-tool {dump,scrap}-cache-tree: fix memory leaks
277
- - test-tool path-utils: fix a memory leak
278
- - test-tool test-hash: fix a memory leak
416
+ (merged to 'next' on 2022-07-11 at db7a724694)
417
+ + test-tool delta: fix a memory leak
418
+ + test-tool ref-store: fix a memory leak
419
+ + test-tool bloom: fix memory leaks
420
+ + test-tool json-writer: fix memory leaks
421
+ + test-tool regex: call regfree(), fix memory leaks
422
+ + test-tool urlmatch-normalization: fix a memory leak
423
+ + test-tool {dump,scrap}-cache-tree: fix memory leaks
424
+ + test-tool path-utils: fix a memory leak
425
+ + test-tool test-hash: fix a memory leak
426
427
Plug various memory leaks in test-tool commands.
428
282
- Will merge to 'next'.
429
+ Will merge to 'master'.
430
source: <cover-v2-0.9-00000000000-20220701T103503Z-avarab@gmail.com>
431
432
@@ -294,19 +441,20 @@ Release tarballs are available at:
441
442
443
* gc/submodule-use-super-prefix (2022-06-30) 8 commits
297
- - submodule--helper: remove display path helper
298
- - submodule--helper update: use --super-prefix
299
- - submodule--helper: remove unused SUPPORT_SUPER_PREFIX flags
300
- - submodule--helper: use correct display path helper
301
- - submodule--helper: don't recreate recursive prefix
302
- - submodule--helper update: use display path helper
303
- - submodule--helper tests: add missing "display path" coverage
304
- - Merge branch 'ab/submodule-cleanup' into gc/submodule-use-super-prefix
444
+ (merged to 'next' on 2022-07-11 at 0d9cf172f9)
445
+ + submodule--helper: remove display path helper
446
+ + submodule--helper update: use --super-prefix
447
+ + submodule--helper: remove unused SUPPORT_SUPER_PREFIX flags
448
+ + submodule--helper: use correct display path helper
449
+ + submodule--helper: don't recreate recursive prefix
450
+ + submodule--helper update: use display path helper
451
+ + submodule--helper tests: add missing "display path" coverage
452
+ + Merge branch 'ab/submodule-cleanup' into gc/submodule-use-super-prefix
453
(this branch uses ab/submodule-cleanup.)
454
455
Another step to rewrite more parts of "git submodule" in C.
456
309
- Will merge to 'next'.
457
+ Will merge to 'master'.
458
source: <20220701021157.88858-1-chooglen@google.com>
459
460
@@ -384,16 +532,6 @@ Release tarballs are available at:
532
source: <pull.1278.v4.git.git.1655927252899.gitgitgadget@gmail.com>
533
534
387
-* jk/revisions-doc-markup-fix (2022-06-22) 1 commit
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
-
393
- Will merge to 'master'.
394
- source: <YrOmsA04FZae89be@coredump.intra.peff.net>
395
-
396
-
535
* tk/rev-parse-doc-clarify-at-u (2022-06-23) 1 commit
536
(merged to 'next' on 2022-07-08 at 1075452f32)
537
+ rev-parse: documentation adjustment - mention remote tracking with @{u}
@@ -470,18 +608,6 @@ Release tarballs are available at:
608
source: <pull.1231.v2.git.1655621424.gitgitgadget@gmail.com>
609
610
473
-* rs/combine-diff-with-incompatible-options (2022-06-21) 2 commits
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
-
481
- Will merge to 'master'.
482
- source: <220524.86v8tuvfl1.gmgdl@evledraar.gmail.com>
483
-
484
-
611
* tk/apply-case-insensitive (2022-06-21) 3 commits
612
- apply: support case-only renames in case-insensitive filesystems
613
- reset: new failing test for reset of case-insensitive duplicate in index
@@ -494,14 +620,14 @@ Release tarballs are available at:
620
source: <pull.1257.v2.git.1655655027.gitgitgadget@gmail.com>
621
622
497
-* zh/ls-files-format (2022-07-06) 1 commit
623
+* zh/ls-files-format (2022-07-11) 1 commit
624
- ls-files: introduce "--format" option
625
626
"git ls-files" learns the "--format" option to tweak its output.
627
628
Getting closer to finish?
503
- cf. <220705.86sfng9c5a.gmgdl@evledraar.gmail.com>
504
- source: <pull.1262.v5.git.1657002760815.gitgitgadget@gmail.com>
629
+ cf. <xmqqleszl2p0.fsf@gitster.g>
630
+ source: <pull.1262.v6.git.1657558435532.gitgitgadget@gmail.com>
631
632
633
* ab/test-quoting-fix (2022-06-30) 3 commits
@@ -518,29 +644,20 @@ Release tarballs are available at:
644
645
646
* 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
524
- - merge-ort: small cleanups of check_for_directory_rename
525
- - t6423: add tests of dual directory rename plus add/add conflict
647
+ (merged to 'next' on 2022-07-11 at 5f8dadf87b)
648
+ + merge-ort: fix issue with dual rename and add/add conflict
649
+ + merge-ort: shuffle the computation and cleanup of potential collisions
650
+ + merge-ort: make a separate function for freeing struct collisions
651
+ + merge-ort: small cleanups of check_for_directory_rename
652
+ + t6423: add tests of dual directory rename plus add/add conflict
653
654
Fixes a long-standing corner case bug around directory renames in
655
the merge-ort strategy.
656
530
- Will merge to 'next'.
657
+ Will merge to 'master'.
658
source: <pull.1268.v4.git.1656984823.gitgitgadget@gmail.com>
659
660
534
-* cr/setup-bug-typo (2022-06-17) 1 commit
535
- (merged to 'next' on 2022-06-17 at 8834ffe0ab)
536
- + setup: fix function name in a BUG() message
537
-
538
- Typofix in a BUG() message.
539
-
540
- Will cook in 'next'.
541
- source: <pull.1255.git.1654782920256.gitgitgadget@gmail.com>
542
-
543
-
661
* zk/push-use-bitmaps (2022-06-17) 1 commit
662
(merged to 'next' on 2022-07-08 at 8aa1f94fad)
663
+ send-pack.c: add config push.useBitmaps
@@ -573,17 +690,6 @@ Release tarballs are available at:
690
source: <9b56496b0809cc8a25af877ea97042e2cb7f2af6.1655246092.git.steadmon@google.com>
691
692
576
-* jk/optim-promisor-object-enumeration (2022-06-16) 1 commit
577
- (merged to 'next' on 2022-06-16 at ce0712a74c)
578
- + is_promisor_object(): walk promisor packs in pack-order
579
-
580
- Collection of what is referenced by objects in promisor packs have
581
- been optimized to inspect these objects in the in-pack order.
582
-
583
- Will cook in 'next'.
584
- source: <YqrTsbXbEjx0Pabn@coredump.intra.peff.net>
585
-
586
-
693
* ro/mktree-allow-missing-fix (2022-06-21) 1 commit
694
(merged to 'next' on 2022-07-08 at 599ed6fb84)
695
+ mktree: do not check type of remote objects
@@ -596,56 +702,6 @@ Release tarballs are available at:
702
source: <748f39a9-65aa-2110-cf92-7ddf81b5f507@roku.com>
703
704
599
-* pb/diff-doc-raw-format (2022-06-13) 3 commits
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
-
611
-* rs/archive-with-internal-gzip (2022-06-15) 6 commits
612
- (merged to 'next' on 2022-06-17 at ab5af6acd1)
613
- + archive-tar: use internal gzip by default
614
- + archive-tar: use OS_CODE 3 (Unix) for internal gzip
615
- + archive-tar: add internal gzip implementation
616
- + archive-tar: factor out write_block()
617
- + archive: rename archiver data field to filter_command
618
- + archive: update format documentation
619
-
620
- Teach "git archive" to (optionally and then by default) avoid
621
- spawning an external "gzip" process when creating ".tar.gz" (and
622
- ".tgz") archives.
623
-
624
- Will cook in 'next'.
625
- source: <9df761c3-355a-ede9-7971-b32687fe9abb@web.de>
626
-
627
-
628
-* ds/branch-checked-out (2022-06-21) 7 commits
629
- (merged to 'next' on 2022-06-21 at e42bc4566f)
630
- + branch: drop unused worktrees variable
631
- + fetch: stop passing around unused worktrees variable
632
- (merged to 'next' on 2022-06-17 at c881874257)
633
- + branch: fix branch_checked_out() leaks
634
- + branch: use branch_checked_out() when deleting refs
635
- + fetch: use new branch_checked_out() and add tests
636
- + branch: check for bisects and rebases
637
- + branch: add branch_checked_out() helper
638
- (this branch is used by ds/rebase-update-ref.)
639
-
640
- Introduce a helper to see if a branch is already being worked on
641
- (hence should not be newly checked out in a working tree), which
642
- performs much better than the existing find_shared_symref() to
643
- replace many uses of the latter.
644
-
645
- Will cook in 'next'.
646
- source: <pull.1254.v2.git.1655234853.gitgitgadget@gmail.com>
647
-
648
-
705
* jt/connected-show-missing-from-which-side (2022-06-10) 1 commit
706
- fetch,fetch-pack: clarify connectivity check error
707
@@ -681,62 +737,52 @@ Release tarballs are available at:
737
source: <cover-v4-00.12-00000000000-20220628T095914Z-avarab@gmail.com>
738
739
684
-* jc/resolve-undo (2022-06-09) 1 commit
740
+* jc/resolve-undo (2022-07-11) 2 commits
741
+ - fsck: do not dereference NULL while checking resolve-undo data
742
(merged to 'next' on 2022-06-15 at c195e5a2d9)
743
+ revision: mark blobs needed for resolve-undo as reachable
744
745
The resolve-undo information in the index was not protected against
746
GC, which has been corrected.
747
691
- Will cook in 'next'.
748
+ Will merge to 'next'.
749
source: <xmqqfskdieqz.fsf@gitster.g>
750
751
752
* ab/build-gitweb (2022-06-28) 8 commits
696
- - gitweb/Makefile: add a "NO_GITWEB" parameter
697
- - Makefile: build 'gitweb' in the default target
698
- - gitweb/Makefile: include in top-level Makefile
699
- - gitweb: remove "test" and "test-installed" targets
700
- - gitweb/Makefile: prepare to merge into top-level Makefile
701
- - gitweb/Makefile: clear up and de-duplicate the gitweb.{css,js} vars
702
- - gitweb/Makefile: add a $(GITWEB_ALL) variable
703
- - gitweb/Makefile: define all .PHONY prerequisites inline
753
+ (merged to 'next' on 2022-07-11 at 731e354ff0)
754
+ + gitweb/Makefile: add a "NO_GITWEB" parameter
755
+ + Makefile: build 'gitweb' in the default target
756
+ + gitweb/Makefile: include in top-level Makefile
757
+ + gitweb: remove "test" and "test-installed" targets
758
+ + gitweb/Makefile: prepare to merge into top-level Makefile
759
+ + gitweb/Makefile: clear up and de-duplicate the gitweb.{css,js} vars
760
+ + gitweb/Makefile: add a $(GITWEB_ALL) variable
761
+ + gitweb/Makefile: define all .PHONY prerequisites inline
762
763
Teach "make all" to build gitweb as well.
764
707
- Will merge to 'next'?
765
+ Will merge to 'master'.
766
source: <cover-v3-0.8-00000000000-20220628T100936Z-avarab@gmail.com>
767
768
769
* ab/test-without-templates (2022-06-06) 7 commits
712
- - tests: don't assume a .git/info for .git/info/sparse-checkout
713
- - tests: don't assume a .git/info for .git/info/exclude
714
- - tests: don't assume a .git/info for .git/info/refs
715
- - tests: don't assume a .git/info for .git/info/attributes
716
- - tests: don't assume a .git/info for .git/info/grafts
717
- - tests: don't depend on template-created .git/branches
718
- - t0008: don't rely on default ".git/info/exclude"
770
+ (merged to 'next' on 2022-07-11 at afab6c1918)
771
+ + tests: don't assume a .git/info for .git/info/sparse-checkout
772
+ + tests: don't assume a .git/info for .git/info/exclude
773
+ + tests: don't assume a .git/info for .git/info/refs
774
+ + tests: don't assume a .git/info for .git/info/attributes
775
+ + tests: don't assume a .git/info for .git/info/grafts
776
+ + tests: don't depend on template-created .git/branches
777
+ + t0008: don't rely on default ".git/info/exclude"
778
779
Tweak tests so that they still work when the "git init" template
780
did not create .git/info directory.
781
723
- Will merge to 'next'?
782
+ Will merge to 'master'.
783
source: <cover-v2-0.7-00000000000-20220603T110506Z-avarab@gmail.com>
784
785
727
-* ac/bitmap-format-doc (2022-06-16) 3 commits
728
- (merged to 'next' on 2022-06-16 at 5591d11601)
729
- + bitmap-format.txt: add information for trailing checksum
730
- + bitmap-format.txt: fix some formatting issues
731
- + bitmap-format.txt: feed the file to asciidoc to generate html
732
-
733
- Adjust technical/bitmap-format to be formatted by AsciiDoc, and
734
- add some missing information to the documentation.
735
-
736
- Will cook in 'next'.
737
- source: <pull.1246.v4.git.1655355834.gitgitgadget@gmail.com>
738
-
739
-
786
* hx/unpack-streaming (2022-06-13) 6 commits
787
(merged to 'next' on 2022-07-08 at 4eb375ec2f)
788
+ unpack-objects: use stream_loose_object() to unpack large objects
@@ -814,6 +860,8 @@ Release tarballs are available at:
860
861
Introduce a discovery.barerepository configuration variable that
862
allows users to forbid discovery of bare repositories.
863
+
864
+ Will merge to 'next'?
865
source: <pull.1261.v7.git.git.1657234914.gitgitgadget@gmail.com>
866
867