What's cooking (2022/07 #04)
Junio C Hamano committed
Jul 13, 2022 at 16:24 UTC
c0e3e9479112b8b0a027f8157ef0016d2a6fd0c2
1 file changed
+229
-258
whats-cooking.txt
+229
-258
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2022, #03; Mon, 11)
3
-X-master-at: f2e5255fc2d3a043f37e259012e1ccd013d6e4b8
4
-X-next-at: 0f90570f4190085940668d388fe346adefe9cb5d
2
+Subject: What's cooking in git.git (Jul 2022, #04; Wed, 13)
3
+X-master-at: 4e2a4d1dd44367d7783f33b169698f2930ff13c0
4
+X-next-at: 683cc31c60e2f21e9eb1dfeb04c5b8ef1ab1459d
5
6
-What's cooking in git.git (Jul 2022, #03; Mon, 11)
6
+What's cooking in git.git (Jul 2022, #04; Wed, 13)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -45,163 +45,203 @@ Release tarballs are available at:
45
--------------------------------------------------
46
[Graduated to 'master']
47
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
48
+* ab/test-quoting-fix (2022-06-30) 3 commits
49
+ (merged to 'next' on 2022-07-06 at 0aa78fd9db)
50
+ + config tests: fix harmless but broken "rm -r" cleanup
51
+ + test-lib.sh: fix prepend_var() quoting issue
52
+ + tests: add missing double quotes to included library paths
53
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>
54
+ Fixes for tests when the source directory has unusual characters in
55
+ its path, e.g. whitespaces, double-quotes, etc.
56
+ source: <cover-v2-0.3-00000000000-20220630T101646Z-avarab@gmail.com>
57
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
59
+* cl/grep-max-count (2022-06-22) 1 commit
60
+ (merged to 'next' on 2022-07-08 at 646199ab4c)
61
+ + grep: add --max-count command line option
62
63
- Typofix in a BUG() message.
64
- source: <pull.1255.git.1654782920256.gitgitgadget@gmail.com>
63
+ "git grep -m<max-hits>" is a way to limit the hits shown per file.
64
+ source: <pull.1278.v4.git.git.1655927252899.gitgitgadget@gmail.com>
65
66
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.)
67
+* dr/i18n-die-warn-error-usage (2022-06-21) 1 commit
68
+ (merged to 'next' on 2022-07-08 at 6f639750a1)
69
+ + i18n: mark message helpers prefix for translation
70
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>
71
+ Give _() markings to fatal/warning/usage: labels that are shown in
72
+ front of these messages.
73
+ source: <pull.1279.v2.git.git.1655819877758.gitgitgadget@gmail.com>
74
75
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
76
+* ds/git-rebase-doc-markup (2022-06-30) 1 commit
77
+ (merged to 'next' on 2022-07-08 at 24a0b80b71)
78
+ + git-rebase.txt: use back-ticks consistently
79
90
- Will merge to 'master'.
91
- source: <pull.1271.git.1656354587496.gitgitgadget@gmail.com>
80
+ References to commands-to-be-typed-literally in "git rebase"
81
+ documentation mark-up have been corrected.
82
+ source: <pull.1270.v3.git.1656508868146.gitgitgadget@gmail.com>
83
84
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
85
+* ds/t5510-brokequote (2022-06-21) 1 commit
86
+ (merged to 'next' on 2022-07-06 at 2776bed385)
87
+ + t5510: replace 'origin' with URL more carefully
88
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>
89
+ Test fix.
90
+ source: <484a330e-0902-6e1b-8189-63c72dcea494@github.com>
91
92
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
93
+* en/t6429-test-must-be-empty-fix (2022-06-30) 1 commit
94
+ (merged to 'next' on 2022-07-06 at 627c51773c)
95
+ + t6429: fix use of non-existent function
96
107
- Documentation mark-up fix.
108
- source: <YrOmsA04FZae89be@coredump.intra.peff.net>
97
+ A test fix.
98
+ source: <pull.1276.git.1656652799863.gitgitgadget@gmail.com>
99
100
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
101
+* jk/remote-show-with-negative-refspecs (2022-06-17) 1 commit
102
+ (merged to 'next' on 2022-07-08 at d4e49ad22a)
103
+ + remote: handle negative refspecs in git remote show
104
+ (this branch is used by jk/t5505-restructure.)
105
+
106
+ "git remote show [-n] frotz" now pays attention to negative
107
+ pathspec.
108
+ source: <20220617002036.1577-2-jacob.keller@gmail.com>
109
+
110
+
111
+* ll/ls-files-tests-update (2022-07-06) 1 commit
112
+ (merged to 'next' on 2022-07-06 at 444d1eabd0)
113
+ + ls-files: update test style
114
+
115
+ Test update.
116
+ source: <pull.1269.v6.git.1656863349926.gitgitgadget@gmail.com>
117
+
118
+
119
+* ro/mktree-allow-missing-fix (2022-06-21) 1 commit
120
+ (merged to 'next' on 2022-07-08 at 599ed6fb84)
121
+ + mktree: do not check type of remote objects
122
+
123
+ "git mktree --missing" lazily fetched objects that are missing from
124
+ the local object store, which was totally unnecessary for the purpose
125
+ of creating the tree object(s) from its input.
126
+ source: <748f39a9-65aa-2110-cf92-7ddf81b5f507@roku.com>
127
117
- Update "git diff/log --raw" format documentation.
118
- source: <pull.1259.git.1655123383.gitgitgadget@gmail.com>
128
129
+* tb/pack-objects-remove-pahole-comment (2022-06-28) 1 commit
130
+ (merged to 'next' on 2022-07-06 at d7494fbdef)
131
+ + pack-objects.h: remove outdated pahole results
132
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
133
+ Comment fix.
134
+ source: <1379af2e9d271b501ef3942398e7f159a9c77973.1656440978.git.me@ttaylorr.com>
135
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>
136
137
+* tk/rev-parse-doc-clarify-at-u (2022-06-23) 1 commit
138
+ (merged to 'next' on 2022-07-08 at 1075452f32)
139
+ + rev-parse: documentation adjustment - mention remote tracking with @{u}
140
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
141
+ Doc update.
142
+ source: <pull.1265.v2.git.1655960512385.gitgitgadget@gmail.com>
143
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
+
145
+* zk/push-use-bitmaps (2022-06-17) 1 commit
146
+ (merged to 'next' on 2022-07-08 at 8aa1f94fad)
147
+ + send-pack.c: add config push.useBitmaps
148
+
149
+ "git push" sometimes perform poorly when reachability bitmaps are
150
+ used, even in a repository where other operations are helped by
151
+ bitmaps. The push.useBitmaps configuration variable is introduced
152
+ to allow disabling use of reachability bitmaps only for "git push".
153
+ source: <pull.1263.v4.git.1655492779228.gitgitgadget@gmail.com>
154
155
--------------------------------------------------
156
[New Topics]
157
148
-* po/doc-add-renormalize (2022-07-09) 1 commit
149
- - doc add: renormalize is not idempotent for CRCRLF
158
+* jk/diff-files-cleanup-fix (2022-07-12) 1 commit
159
+ (merged to 'next' on 2022-07-13 at 9db5235d01)
160
+ + diff-files: move misplaced cleanup label
161
151
- Documentation for "git add --renormalize" has been improved.
162
+ An earlier attempt to plug leaks placed a clean-up label to jump to
163
+ at a bogus place, which as been corrected.
164
153
- Will merge to 'next'?
154
- source: <d3b8ed97a105ea1d7e656c964b7eee378e11ede6.1657385781.git.gitgitgadget@gmail.com>
165
+ Will merge to 'master'.
166
+ source: <Ys0c0ePxPOqZ/5ck@coredump.intra.peff.net>
167
168
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
169
+* cw/submodule-merge-messages (2022-07-13) 1 commit
170
+ - submodule merge: update conflict error message
171
162
- The glossary entries for "commit-graph file" and "reachability
163
- bitmap" have been added.
172
+ Update the message given when "git merge" sees conflicts at a path
173
+ with a submodule while merging a superproject.
174
165
- Will merge to 'next'?
166
- source: <pull.1282.git.1657385781.gitgitgadget@gmail.com>
175
+ Needs review.
176
+ source: <20220712231935.2979727-1-calvinwan@google.com>
177
178
169
-* rs/cocci-array-copy (2022-07-10) 1 commit
170
- - cocci: avoid normalization rules for memcpy
179
+* ds/doc-allowlist (2022-07-13) 3 commits
180
+ - *: use allowlist and denylist
181
+ - t/*: use allowlist
182
+ - Documentation: use allowlist and denylist
183
172
- A coccinelle rule (in contrib/) to encourage use of COPY_ARRAY
173
- macro has been improved.
184
+ Mechanical replacement of s/whitelist/allowlist/.
185
175
- Will merge to 'next'.
176
- source: <ded153d4-4aea-d4da-11cb-ec66d181e4c9@web.de>
186
+ Expecting a reroll.
187
+ source: <pull.1274.git.1657718450.gitgitgadget@gmail.com>
188
189
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
190
+* js/vimdiff-quotepath-fix (2022-07-13) 2 commits
191
+ - SQUASH???
192
+ - mergetool(vimdiff): allow paths to contain spaces again
193
183
- The way "git multi-pack" uses parse-options API has been improved.
194
+ Variable quoting fix in the vimdiff driver of "git mergetool"
195
185
- Will merge to 'master'.
186
- source: <20220710151645.GA2038@szeder.dev>
196
+ Expecting a reroll.
197
+ cf. <xmqqa69cabhq.fsf@gitster.g>
198
+ source: <pull.1287.git.1657726969774.gitgitgadget@gmail.com>
199
200
189
-* jk/ref-filter-discard-commit-buffer (2022-07-11) 1 commit
190
- - ref-filter: disable save_commit_buffer while traversing
201
+* mt/checkout-count-fix (2022-07-13) 3 commits
202
+ - checkout: fix two bugs on the final count of updated entries
203
+ - checkout: show bug about failed entries being included in final report
204
+ - checkout: document bug where delayed checkout counts entries twice
205
192
- source: <Ysw4JtoHW1vWmqhz@coredump.intra.peff.net>
206
+ "git checkout" miscounted the paths it updated, which has been
207
+ corrected.
208
+
209
+ Will merge to 'next'?
210
+ source: <cover.1657685948.git.matheus.bernardino@usp.br>
211
+
212
+
213
+* tb/commit-graph-genv2-upgrade-fix (2022-07-13) 3 commits
214
+ - commit-graph: fix corrupt upgrade from generation v1 to v2
215
+ - commit-graph: introduce `repo_find_commit_pos_in_graph()`
216
+ - t5318: demonstrate commit-graph generation v2 corruption
217
+
218
+ There was a bug in the codepath to upgrade generation information
219
+ in commit-graph from v1 to v2 format, which has been corrected.
220
+
221
+ Needs review.
222
+ source: <cover.1657667404.git.me@ttaylorr.com>
223
+
224
+
225
+* js/safe-directory-plus (2022-07-13) 3 commits
226
+ - mingw: be more informative when ownership check fails on FAT32
227
+ - mingw: handle a file owned by the Administrators group correctly
228
+ - Allow debugging unsafe directories' ownership
229
+
230
+ Needs review.
231
+ source: <pull.1286.git.1657700238.gitgitgadget@gmail.com>
232
233
--------------------------------------------------
234
[Stalled]
235
236
* ll/curl-accept-language (2022-07-11) 1 commit
198
- - remote-curl: send Accept-Language header to server
237
+ (merged to 'next' on 2022-07-13 at 076aba7421)
238
+ + remote-curl: send Accept-Language header to server
239
240
Earlier, HTTP transport clients learned to tell the server side
241
what locale they are in by sending Accept-Language HTTP header, but
242
this was done only for some requests but not others.
243
204
- Will merge to 'next'.
244
+ Will merge to 'master'.
245
source: <pull.1251.v4.git.1657519134336.gitgitgadget@gmail.com>
246
247
@@ -240,6 +280,58 @@ Release tarballs are available at:
280
--------------------------------------------------
281
[Cooking]
282
283
+* po/doc-add-renormalize (2022-07-09) 1 commit
284
+ - doc add: renormalize is not idempotent for CRCRLF
285
+
286
+ Documentation for "git add --renormalize" has been improved.
287
+
288
+ Expecting a reroll.
289
+ cf. <dfe0c1ab-33f8-f13e-71ce-1829bb0d2d7f@iee.email>
290
+ source: <d3b8ed97a105ea1d7e656c964b7eee378e11ede6.1657385781.git.gitgitgadget@gmail.com>
291
+
292
+
293
+* po/glossary-around-traversal (2022-07-09) 3 commits
294
+ - glossary: add reachability bitmap description
295
+ - glossary: add commit graph description
296
+ - glossary: add Object DataBase (ODB) abbreviation
297
+
298
+ The glossary entries for "commit-graph file" and "reachability
299
+ bitmap" have been added.
300
+
301
+ Expecting a reroll.
302
+ cf. <dfe0c1ab-33f8-f13e-71ce-1829bb0d2d7f@iee.email>
303
+ source: <pull.1282.git.1657385781.gitgitgadget@gmail.com>
304
+
305
+
306
+* rs/cocci-array-copy (2022-07-10) 1 commit
307
+ (merged to 'next' on 2022-07-13 at f21dec0f71)
308
+ + cocci: avoid normalization rules for memcpy
309
+
310
+ A coccinelle rule (in contrib/) to encourage use of COPY_ARRAY
311
+ macro has been improved.
312
+
313
+ Will merge to 'master'.
314
+ source: <ded153d4-4aea-d4da-11cb-ec66d181e4c9@web.de>
315
+
316
+
317
+* sg/multi-pack-index-parse-options-fix (2022-07-10) 1 commit
318
+ (merged to 'next' on 2022-07-11 at 1e14685680)
319
+ + multi-pack-index: simplify handling of unknown --options
320
+
321
+ The way "git multi-pack" uses parse-options API has been improved.
322
+
323
+ Will merge to 'master'.
324
+ source: <20220710151645.GA2038@szeder.dev>
325
+
326
+
327
+* jk/ref-filter-discard-commit-buffer (2022-07-11) 1 commit
328
+ (merged to 'next' on 2022-07-13 at d1521724db)
329
+ + ref-filter: disable save_commit_buffer while traversing
330
+
331
+ Will merge to 'master'.
332
+ source: <Ysw4JtoHW1vWmqhz@coredump.intra.peff.net>
333
+
334
+
335
* ab/cocci-unused (2022-07-06) 6 commits
336
(merged to 'next' on 2022-07-11 at 7fa60d2a5b)
337
+ cocci: generalize "unused" rule to cover more than "strbuf"
@@ -259,18 +351,18 @@ Release tarballs are available at:
351
352
353
* 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
354
+ (merged to 'next' on 2022-07-13 at a7ae8cb4b5)
355
+ + clone: move unborn head creation to update_head()
356
+ + clone: use remote branch if it matches default HEAD
357
+ + clone: propagate empty remote HEAD even with other branches
358
+ + clone: drop extra newline from warning message
359
360
"git clone" from a repository with some ref whose HEAD is unborn
361
did not set the HEAD in the resulting repository correctly, which
362
has been corrected.
363
271
- Will merge to 'next'.
364
+ Will merge to 'master'.
365
source: <YsdyLS4UFzj0j/wB@coredump.intra.peff.net>
273
- source: <YsvrsOH1jg559yVt@coredump.intra.peff.net>
366
367
368
* ac/bitmap-lookup-table (2022-07-06) 6 commits
@@ -284,7 +376,8 @@ Release tarballs are available at:
376
The pack bitmap file gained a bitmap-lookup table to speed up
377
locating the necessary bitmap for a given commit.
378
287
- Will merge to 'next'?
379
+ Waiting for a more thorough review.
380
+ cf. <Ys4DjW9JjQFx5Bhb@nand.local>
381
source: <pull.1266.v3.git.1656924376.gitgitgadget@gmail.com>
382
383
@@ -331,7 +424,7 @@ Release tarballs are available at:
424
source: <pull.1285.git.git.1657267260405.gitgitgadget@gmail.com>
425
426
334
-* sa/cat-file-mailmap (2022-07-09) 4 commits
427
+* sa/cat-file-mailmap (2022-07-13) 4 commits
428
- cat-file: add mailmap support
429
- ident: rename commit_rewrite_person() to apply_mailmap_to_header()
430
- ident: move commit_rewrite_person() to ident.c
@@ -339,7 +432,9 @@ Release tarballs are available at:
432
433
"git cat-file" learned an option to use the mailmap when showing
434
commit and tag objects.
342
- source: <20220709154149.165524-1-siddharthasthana31@gmail.com>
435
+
436
+ Will merge to 'next'?
437
+ source: <20220712160634.213956-1-siddharthasthana31@gmail.com>
438
439
440
* fr/vimdiff-layout-fix (2022-07-08) 1 commit
@@ -353,19 +448,11 @@ Release tarballs are available at:
448
source: <20220708181024.45839-1-greenfoo@u92.eu>
449
450
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
359
-
360
- References to commands-to-be-typed-literally in "git rebase"
361
- documentation mark-up have been corrected.
362
-
363
- Will merge to 'master'.
364
- source: <pull.1270.v3.git.1656508868146.gitgitgadget@gmail.com>
365
-
366
-
367
-* ds/rebase-update-ref (2022-06-28) 8 commits
451
+* ds/rebase-update-ref (2022-07-12) 13 commits
452
+ - sequencer: notify user of --update-refs activity
453
+ - sequencer: ignore HEAD ref under --update-refs
454
- rebase: add rebase.updateRefs config option
455
+ - sequencer: rewrite update-refs as user edits todo list
456
- rebase: update refs from 'update-ref' commands
457
- rebase: add --update-refs option
458
- sequencer: add update-ref command
@@ -373,23 +460,15 @@ Release tarballs are available at:
460
- rebase-interactive: update 'merge' description
461
- branch: consider refs under 'update-refs'
462
- t2407: test branches currently using apply backend
463
+ - t2407: test bisect and rebase as black-boxes
464
+ - Merge branch 'ds/branch-checked-out' into ds/rebase-update-ref
465
466
"git rebase -i" learns to update branches whose tip appear in the
467
rebased range.
468
469
Expecting a reroll.
470
cf. <15631ea2-6722-fd24-c8a6-0cee638b0602@github.com>
382
- source: <pull.1247.v3.git.1656422759.gitgitgadget@gmail.com>
383
-
384
-
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
388
-
389
- Comment fix.
390
-
391
- Will merge to 'master'.
392
- source: <1379af2e9d271b501ef3942398e7f159a9c77973.1656440978.git.me@ttaylorr.com>
471
+ source: <pull.1247.v4.git.1657631225.gitgitgadget@gmail.com>
472
473
474
* ab/leakfix (2022-07-01) 11 commits
@@ -430,16 +509,6 @@ Release tarballs are available at:
509
source: <cover-v2-0.9-00000000000-20220701T103503Z-avarab@gmail.com>
510
511
433
-* en/t6429-test-must-be-empty-fix (2022-06-30) 1 commit
434
- (merged to 'next' on 2022-07-06 at 627c51773c)
435
- + t6429: fix use of non-existent function
436
-
437
- A test fix.
438
-
439
- Will merge to 'master'.
440
- source: <pull.1276.git.1656652799863.gitgitgadget@gmail.com>
441
-
442
-
512
* gc/submodule-use-super-prefix (2022-06-30) 8 commits
513
(merged to 'next' on 2022-07-11 at 0d9cf172f9)
514
+ submodule--helper: remove display path helper
@@ -458,7 +527,9 @@ Release tarballs are available at:
527
source: <20220701021157.88858-1-chooglen@google.com>
528
529
461
-* hx/lookup-commit-in-graph-fix (2022-06-30) 1 commit
530
+* hx/lookup-commit-in-graph-fix (2022-07-12) 2 commits
531
+ (merged to 'next' on 2022-07-13 at 4489696814)
532
+ + t5330: remove run_with_limited_processses()
533
(merged to 'next' on 2022-07-08 at cef32db0b6)
534
+ commit-graph.c: no lazy fetch in lookup_commit_in_graph()
535
@@ -466,17 +537,7 @@ Release tarballs are available at:
537
remote resulted in infinite recursion has been corrected.
538
539
Will merge to 'master'.
469
- source: <96d4bb71505d87ed501c058bbd89bfc13d08b24a.1656593279.git.hanxin.hx@bytedance.com>
470
-
471
-
472
-* ll/ls-files-tests-update (2022-07-06) 1 commit
473
- (merged to 'next' on 2022-07-06 at 444d1eabd0)
474
- + ls-files: update test style
475
-
476
- Test update.
477
-
478
- Will merge to 'master'.
479
- source: <pull.1269.v6.git.1656863349926.gitgitgadget@gmail.com>
540
+ source: <cover.1656593279.git.hanxin.hx@bytedance.com>
541
542
543
* pw/xdiff-alloc (2022-07-08) 4 commits
@@ -522,26 +583,6 @@ Release tarballs are available at:
583
source: <patch-v2-1.1-a1fc37de947-20220630T084607Z-avarab@gmail.com>
584
585
525
-* cl/grep-max-count (2022-06-22) 1 commit
526
- (merged to 'next' on 2022-07-08 at 646199ab4c)
527
- + grep: add --max-count command line option
528
-
529
- "git grep -m<max-hits>" is a way to limit the hits shown per file.
530
-
531
- Will merge to 'master'.
532
- source: <pull.1278.v4.git.git.1655927252899.gitgitgadget@gmail.com>
533
-
534
-
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}
538
-
539
- Doc update.
540
-
541
- Will merge to 'master'.
542
- source: <pull.1265.v2.git.1655960512385.gitgitgadget@gmail.com>
543
-
544
-
586
* en/merge-tree (2022-06-22) 17 commits
587
(merged to 'next' on 2022-07-08 at a29b4896ab)
588
+ git-merge-tree.txt: add a section on potentional usage mistakes
@@ -571,27 +612,6 @@ Release tarballs are available at:
612
source: <pull.1122.v7.git.1655511660.gitgitgadget@gmail.com>
613
614
574
-* dr/i18n-die-warn-error-usage (2022-06-21) 1 commit
575
- (merged to 'next' on 2022-07-08 at 6f639750a1)
576
- + i18n: mark message helpers prefix for translation
577
-
578
- Give _() markings to fatal/warning/usage: labels that are shown in
579
- front of these messages.
580
-
581
- Will merge to 'master'.
582
- source: <pull.1279.v2.git.git.1655819877758.gitgitgadget@gmail.com>
583
-
584
-
585
-* ds/t5510-brokequote (2022-06-21) 1 commit
586
- (merged to 'next' on 2022-07-06 at 2776bed385)
587
- + t5510: replace 'origin' with URL more carefully
588
-
589
- Test fix.
590
-
591
- Will merge to 'master'.
592
- source: <484a330e-0902-6e1b-8189-63c72dcea494@github.com>
593
-
594
-
615
* en/merge-restore-to-pristine (2022-06-21) 6 commits
616
- merge: do not exit restore_state() prematurely
617
- merge: ensure we can actually restore pre-merge state
@@ -620,27 +640,13 @@ Release tarballs are available at:
640
source: <pull.1257.v2.git.1655655027.gitgitgadget@gmail.com>
641
642
623
-* zh/ls-files-format (2022-07-11) 1 commit
643
+* zh/ls-files-format (2022-07-13) 1 commit
644
- ls-files: introduce "--format" option
645
646
"git ls-files" learns the "--format" option to tweak its output.
647
628
- Getting closer to finish?
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
634
- (merged to 'next' on 2022-07-06 at 0aa78fd9db)
635
- + config tests: fix harmless but broken "rm -r" cleanup
636
- + test-lib.sh: fix prepend_var() quoting issue
637
- + tests: add missing double quotes to included library paths
638
-
639
- Fixes for tests when the source directory has unusual characters in
640
- its path, e.g. whitespaces, double-quotes, etc.
641
-
642
- Will merge to 'master'.
643
- source: <cover-v2-0.3-00000000000-20220630T101646Z-avarab@gmail.com>
648
+ Will merge to 'next'?
649
+ source: <pull.1262.v7.git.1657692472994.gitgitgadget@gmail.com>
650
651
652
* en/merge-dual-dir-renames-fix (2022-07-06) 5 commits
@@ -658,31 +664,6 @@ Release tarballs are available at:
664
source: <pull.1268.v4.git.1656984823.gitgitgadget@gmail.com>
665
666
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
664
-
665
- "git push" sometimes perform poorly when reachability bitmaps are
666
- used, even in a repository where other operations are helped by
667
- bitmaps. The push.useBitmaps configuration variable is introduced
668
- to allow disabling use of reachability bitmaps only for "git push".
669
-
670
- Will merge to 'master'.
671
- source: <pull.1263.v4.git.1655492779228.gitgitgadget@gmail.com>
672
-
673
-
674
-* jk/remote-show-with-negative-refspecs (2022-06-17) 1 commit
675
- (merged to 'next' on 2022-07-08 at d4e49ad22a)
676
- + remote: handle negative refspecs in git remote show
677
- (this branch is used by jk/t5505-restructure.)
678
-
679
- "git remote show [-n] frotz" now pays attention to negative
680
- pathspecs.
681
-
682
- Will merge to 'master'.
683
- source: <20220617002036.1577-2-jacob.keller@gmail.com>
684
-
685
-
667
* js/commit-graph-parsing-without-repo-settings (2022-06-15) 1 commit
668
- commit-graph: refactor to avoid prepare_repo_settings
669
@@ -690,18 +671,6 @@ Release tarballs are available at:
671
source: <9b56496b0809cc8a25af877ea97042e2cb7f2af6.1655246092.git.steadmon@google.com>
672
673
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
696
-
697
- "git mktree --missing" lazily fetched objects that are missing from
698
- the local object store, which was totally unnecessary for the purpose
699
- of creating the tree object(s) from its input.
700
-
701
- Will merge to 'master'.
702
- source: <748f39a9-65aa-2110-cf92-7ddf81b5f507@roku.com>
703
-
704
-
674
* jt/connected-show-missing-from-which-side (2022-06-10) 1 commit
675
- fetch,fetch-pack: clarify connectivity check error
676
@@ -738,15 +707,16 @@ Release tarballs are available at:
707
708
709
* jc/resolve-undo (2022-07-11) 2 commits
741
- - fsck: do not dereference NULL while checking resolve-undo data
710
+ (merged to 'next' on 2022-07-13 at b9ef9482e8)
711
+ + fsck: do not dereference NULL while checking resolve-undo data
712
(merged to 'next' on 2022-06-15 at c195e5a2d9)
713
+ revision: mark blobs needed for resolve-undo as reachable
714
715
The resolve-undo information in the index was not protected against
716
GC, which has been corrected.
717
748
- Will merge to 'next'.
749
- source: <xmqqfskdieqz.fsf@gitster.g>
718
+ Will merge to 'master'.
719
+ source: <xmqq35f7kzad.fsf@gitster.g>
720
721
722
* ab/build-gitweb (2022-06-28) 8 commits
@@ -861,7 +831,8 @@ Release tarballs are available at:
831
Introduce a discovery.barerepository configuration variable that
832
allows users to forbid discovery of bare repositories.
833
864
- Will merge to 'next'?
834
+ Expecting a reroll.
835
+ cf. <kl6lpmia55ys.fsf@chooglen-macbookpro.roam.corp.google.com>
836
source: <pull.1261.v7.git.git.1657234914.gitgitgadget@gmail.com>
837
838