What's cooking (2022/07 #07)
Junio C Hamano committed
Jul 22, 2022 at 15:33 UTC
59a3e176af6b540c42957fd7f2ff5c55f306ad12
1 file changed
+257
-393
whats-cooking.txt
+257
-393
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2022, #06; Tue, 19)
3
-X-master-at: e72d93e88cb20b06e88e6e7d81bd1dc4effe453f
4
-X-next-at: a122caa7aef2a7df25e111e06a49b1727cd52b08
2
+Subject: What's cooking in git.git (Jul 2022, #07; Fri, 22)
3
+X-master-at: 6a475b71f8c4ce708d69fdc9317aefbde3769e25
4
+X-next-at: a8f742fd52ac1e242fca73527be643aa60514c94
5
6
-What's cooking in git.git (Jul 2022, #06; Tue, 19)
6
+What's cooking in git.git (Jul 2022, #07; Fri, 22)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking in my tree. Commits
@@ -40,19 +40,200 @@ Release tarballs are available at:
40
41
https://www.kernel.org/pub/software/scm/git/
42
43
+--------------------------------------------------
44
+[Graduated to 'master']
45
+
46
+* gc/bare-repo-discovery (2022-07-14) 5 commits
47
+ (merged to 'next' on 2022-07-15 at 5206577852)
48
+ + setup.c: create `safe.bareRepository`
49
+ + safe.directory: use git_protected_config()
50
+ + config: learn `git_protected_config()`
51
+ + Documentation: define protected configuration
52
+ + Documentation/git-config.txt: add SCOPES section
53
+
54
+ Introduce a discovery.barerepository configuration variable that
55
+ allows users to forbid discovery of bare repositories.
56
+ source: <pull.1261.v8.git.git.1657834081.gitgitgadget@gmail.com>
57
+
58
+
59
+* js/ci-github-workflow-markup (2022-07-14) 1 commit
60
+ (merged to 'next' on 2022-07-15 at 196166f671)
61
+ + tests: fix incorrect --write-junit-xml code
62
+
63
+ A fix for a regression in test framework.
64
+ source: <pull.1288.git.1657789234416.gitgitgadget@gmail.com>
65
+
66
+
67
+* js/shortlog-sort-stably (2022-07-14) 1 commit
68
+ (merged to 'next' on 2022-07-15 at 75e4efe678)
69
+ + shortlog: use a stable sort
70
+
71
+ "git shortlog -n" relied on the underlying qsort() to be stable,
72
+ which shouldn't have. Fixed.
73
+ source: <pull.1290.git.1657813429221.gitgitgadget@gmail.com>
74
+
75
+
76
+* js/vimdiff-quotepath-fix (2022-07-14) 1 commit
77
+ (merged to 'next' on 2022-07-15 at 4273bbd4b4)
78
+ + mergetool(vimdiff): allow paths to contain spaces again
79
+
80
+ Variable quoting fix in the vimdiff driver of "git mergetool"
81
+ source: <pull.1287.v2.git.1657809063728.gitgitgadget@gmail.com>
82
+
83
+
84
+* rs/mingw-tighten-mkstemp (2022-07-14) 1 commit
85
+ (merged to 'next' on 2022-07-15 at 4dd4a117ec)
86
+ + mingw: avoid mktemp() in mkstemp() implementation
87
+
88
+ mkstemp() emulation on Windows has been improved.
89
+ source: <7265e37f-fd29-3579-b840-19a1df52a59f@web.de>
90
+
91
--------------------------------------------------
92
[New Topics]
93
94
+* ab/leak-check (2022-07-20) 14 commits
95
+ - CI: use "GIT_TEST_SANITIZE_LEAK_LOG=true" in linux-leaks
96
+ - upload-pack: fix a memory leak in create_pack_file()
97
+ - leak tests: mark passing SANITIZE=leak tests as leak-free
98
+ - test-lib: have the "check" mode for SANITIZE=leak consider leak logs
99
+ - test-lib: add a GIT_TEST_PASSING_SANITIZE_LEAK=check mode
100
+ - test-lib: simplify by removing test_external
101
+ - tests: move copy/pasted PERL + Test::More checks to a lib-perl.sh
102
+ - t/Makefile: don't remove test-results in "clean-except-prove-cache"
103
+ - test-lib: add a SANITIZE=leak logging mode
104
+ - t/README: reword the "GIT_TEST_PASSING_SANITIZE_LEAK" description
105
+ - test-lib: add a --invert-exit-code switch
106
+ - test-lib: fix GIT_EXIT_OK logic errors, use BAIL_OUT
107
+ - test-lib: don't set GIT_EXIT_OK before calling test_atexit_handler
108
+ - test-lib: use $1, not $@ in test_known_broken_{ok,failure}_
109
+
110
+ Plugging more leaks.
111
+ source: <cover-v2-00.14-00000000000-20220720T211221Z-avarab@gmail.com>
112
+
113
+
114
+* mb/p4-fixes (2022-07-20) 2 commits
115
+ (merged to 'next' on 2022-07-20 at 7942d72b1c)
116
+ + git-p4: fix error handling in P4Unshelve.renameBranch()
117
+ + git-p4: fix typo in P4Submit.applyCommit()
118
+
119
+ Fix a few issues in "git p4".
120
+
121
+ Will merge to 'master'.
122
+ source: <pull.1297.v2.git.git.1658343330.gitgitgadget@gmail.com>
123
+
124
+
125
+* mb/p4-utf16-crlf (2022-07-20) 1 commit
126
+ (merged to 'next' on 2022-07-20 at c2fedd2fc2)
127
+ + git-p4: fix CR LF handling for utf16 files
128
+
129
+ "git p4" working on UTF-16 files on Windows did not implement
130
+ CRLF-to-LF conversion correctly, which has been corrected.
131
+
132
+ Will merge to 'master'.
133
+ source: <pull.1294.v2.git.git.1658341065221.gitgitgadget@gmail.com>
134
+
135
+
136
+* jc/string-list-cleanup (2022-07-20) 1 commit
137
+ - builtin/remote.c: use the right kind of STRING_LIST_INIT
138
+
139
+ Code clean-up.
140
+
141
+ Will merge to 'next'.
142
+ source: <xmqq7d471dns.fsf@gitster.g>
143
+
144
+
145
+* mt/pkt-line-comment-tweak (2022-07-22) 1 commit
146
+ (merged to 'next' on 2022-07-22 at 4004fa75eb)
147
+ + pkt-line.h: move comment closer to the associated code
148
+
149
+ In-code comment clarification.
150
+
151
+ Will merge to 'master'.
152
+ source: <6a14443c101fa132498297af6d7a483520688d75.1658488203.git.matheus.bernardino@usp.br>
153
+
154
+
155
+* mt/rot13-in-c (2022-07-22) 3 commits
156
+ - t/t0021: replace old rot13-filter.pl uses with new test-tool cmd
157
+ - t/t0021: convert the rot13-filter.pl script to C
158
+ - Merge branch 'mt/checkout-count-fix' into mt/rot13-in-c
159
+ (this branch uses mt/checkout-count-fix.)
160
+
161
+ Test portability improvements.
162
+
163
+ Needs review.
164
+ source: <cover.1658518769.git.matheus.bernardino@usp.br>
165
+
166
+
167
+* tk/untracked-cache-with-uall (2022-07-22) 1 commit
168
+ - read-cache: make `do_read_index()` always set up `istate->repo`
169
+
170
+ Fix for a bug that makes write-tree to faile to write out a
171
+ non-existent index as a tree, introduced in 2.37.
172
+
173
+ Will merge to 'next'.
174
+ source: <20220722212232.833188-1-martin.agren@gmail.com>
175
+
176
+--------------------------------------------------
177
+[Stalled]
178
+
179
+* tk/apply-case-insensitive (2022-06-21) 3 commits
180
+ - apply: support case-only renames in case-insensitive filesystems
181
+ - reset: new failing test for reset of case-insensitive duplicate in index
182
+ - t4141: test "git apply" with core.ignorecase
183
+
184
+ "git apply" barfed on a patch that makes a case-only rename on a
185
+ case-insensitive filesystem.
186
+
187
+ Needs review.
188
+ source: <pull.1257.v2.git.1655655027.gitgitgadget@gmail.com>
189
+
190
+
191
+* bc/stash-export (2022-04-08) 4 commits
192
+ - builtin/stash: provide a way to import stashes from a ref
193
+ - builtin/stash: provide a way to export stashes to a ref
194
+ - builtin/stash: factor out revision parsing into a function
195
+ - object-name: make get_oid quietly return an error
196
+
197
+ A mechanism to export and import stash entries to and from a normal
198
+ commit to transfer it across repositories has been introduced.
199
+
200
+ Expecting a reroll.
201
+ cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
202
+ source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
203
+
204
+
205
+* cw/remote-object-info (2022-05-06) 11 commits
206
+ - SQUASH??? coccicheck
207
+ - SQUASH??? ensure that coccicheck is happy
208
+ - SQUASH??? compilation fix
209
+ - cat-file: add --batch-command remote-object-info command
210
+ - cat-file: move parse_cmd and DEFAULT_FORMAT up
211
+ - transport: add object-info fallback to fetch
212
+ - transport: add client side capability to request object-info
213
+ - object-info: send attribute packet regardless of object ids
214
+ - object-store: add function to free object_info contents
215
+ - fetch-pack: move fetch default settings
216
+ - fetch-pack: refactor packet writing
217
+
218
+ A client component to talk with the object-info endpoint.
219
+
220
+ Expecting a reroll.
221
+ source: <20220502170904.2770649-1-calvinwan@google.com>
222
+
223
+--------------------------------------------------
224
+[Cooking]
225
+
226
* ds/midx-with-less-memory (2022-07-19) 3 commits
47
- - midx: reduce memory pressure while writing bitmaps
48
- - midx: extract bitmap write setup
49
- - pack-bitmap-write: use const for hashes
227
+ (merged to 'next' on 2022-07-20 at 250d257c3e)
228
+ + midx: reduce memory pressure while writing bitmaps
229
+ + midx: extract bitmap write setup
230
+ + pack-bitmap-write: use const for hashes
231
232
The codepath to write multi-pack index has been taught to release a
233
large chunk of memory that holds an array of objects in the packs,
234
as soon as it is done with the array, to reduce memory consumption.
235
55
- Will merge to 'next'?
236
+ Will merge to 'master'.
237
source: <pull.1292.v2.git.1658244366.gitgitgadget@gmail.com>
238
239
@@ -113,56 +294,60 @@ Release tarballs are available at:
294
source: <cover.1658159745.git.dyroneteng@gmail.com>
295
296
116
-* tl/trace2-config-scope (2022-07-18) 1 commit
117
- - tr2: dump names if config exist in multiple scopes
297
+* tl/trace2-config-scope (2022-07-22) 2 commits
298
+ - tr2: shows scope unconditionally in addition to key-value pair
299
+ - api-trace2.txt: print config key-value pair
300
301
Tweak trace2 output about configuration variables.
302
121
- Expecting a reroll.
122
- cf. <20220719074053.37282-1-tenglong.tl@tenglongtldeMacBook-Pro.local>
123
- source: <a01ae8478d3a8545241c5b064b6d369a330ee59f.1658159746.git.dyroneteng@gmail.com>
303
+ Will merge to 'next'?
304
+ source: <cover.1658472474.git.dyroneteng@gmail.com>
305
306
307
* vd/scalar-doc (2022-07-18) 2 commits
127
- - scalar: convert README.md into a technical design doc
128
- - scalar: reword command documentation to clarify purpose
308
+ (merged to 'next' on 2022-07-20 at fab0234da4)
309
+ + scalar: convert README.md into a technical design doc
310
+ + scalar: reword command documentation to clarify purpose
311
312
Doc update.
313
132
- Will merge to 'next'.
314
+ Will merge to 'master'.
315
source: <pull.1275.v2.git.1657584367.gitgitgadget@gmail.com>
316
317
318
* cl/rerere-train-with-no-sign (2022-07-19) 1 commit
137
- - contrib/rerere-train: avoid useless gpg sign in training
319
+ (merged to 'next' on 2022-07-20 at fbb9414d09)
320
+ + contrib/rerere-train: avoid useless gpg sign in training
321
322
"rerere-train" script (in contrib/) used to honor commit.gpgSign
323
while recreating the throw-away merges.
324
142
- Will merge to 'next'.
325
+ Will merge to 'master'.
326
source: <PH7PR14MB5594A27B9295E95ACA4D6A69CE8F9@PH7PR14MB5594.namprd14.prod.outlook.com>
327
328
329
* ds/win-syslog-compiler-fix (2022-07-19) 1 commit
147
- - compat/win32: correct for incorrect compiler warning
330
+ (merged to 'next' on 2022-07-20 at d38b649b18)
331
+ + compat/win32: correct for incorrect compiler warning
332
333
Workaround for a false positive compiler warning.
334
151
- Will merge to 'next'.
335
+ Will merge to 'master'.
336
source: <pull.1294.git.1658256354725.gitgitgadget@gmail.com>
337
338
339
* ld/osx-keychain-usage-fix (2022-07-19) 1 commit
156
- - osx-keychain: fix compiler warning
340
+ (merged to 'next' on 2022-07-20 at eebd316ef6)
341
+ + osx-keychain: fix compiler warning
342
343
Workaround for a compiler warning against use of die() in
344
osx-keychain (in contrib/).
345
161
- Will merge to 'next'.
346
+ Will merge to 'master'.
347
source: <pull.1293.git.1658251503775.gitgitgadget@gmail.com>
348
349
165
-* ab/submodule-helper-leakfix (2022-07-19) 24 commits
350
+* ab/submodule-helper-leakfix (2022-07-21) 26 commits
351
- submodule--helper: fix a configure_added_submodule() leak
352
- submodule--helper: fix bad config API usage
353
- submodule--helper: free rest of "displaypath" in "struct update_data"
@@ -186,294 +371,14 @@ Release tarballs are available at:
371
- submodule--helper: fix most "struct pathspec" memory leaks
372
- submodule--helper: fix trivial get_default_remote_submodule() leak
373
- submodule--helper: fix a leak in "clone_submodule"
374
+ - submodule--helper: pass a "const struct module_clone_data" to clone_submodule()
375
+ - submodule--helper: stop conflating "sb" in clone_submodule()
376
- submodule--helper: replace memset() with { 0 }-initialization
377
378
Plugging leaks in submodule--helper.
379
193
- Needs review.
194
- source: <cover-v2-00.24-00000000000-20220719T204458Z-avarab@gmail.com>
195
-
196
---------------------------------------------------
197
-[Graduated to 'master']
198
-
199
-* ab/build-gitweb (2022-06-28) 8 commits
200
- (merged to 'next' on 2022-07-11 at 731e354ff0)
201
- + gitweb/Makefile: add a "NO_GITWEB" parameter
202
- + Makefile: build 'gitweb' in the default target
203
- + gitweb/Makefile: include in top-level Makefile
204
- + gitweb: remove "test" and "test-installed" targets
205
- + gitweb/Makefile: prepare to merge into top-level Makefile
206
- + gitweb/Makefile: clear up and de-duplicate the gitweb.{css,js} vars
207
- + gitweb/Makefile: add a $(GITWEB_ALL) variable
208
- + gitweb/Makefile: define all .PHONY prerequisites inline
209
-
210
- Teach "make all" to build gitweb as well.
211
- source: <cover-v3-0.8-00000000000-20220628T100936Z-avarab@gmail.com>
212
-
213
-
214
-* ab/cocci-unused (2022-07-06) 6 commits
215
- (merged to 'next' on 2022-07-11 at 7fa60d2a5b)
216
- + cocci: generalize "unused" rule to cover more than "strbuf"
217
- + cocci: add and apply a rule to find "unused" strbufs
218
- + cocci: have "coccicheck{,-pending}" depend on "coccicheck-test"
219
- + cocci: add a "coccicheck-test" target and test *.cocci rules
220
- + Makefile & .gitignore: ignore & clean "git.res", not "*.res"
221
- + Makefile: remove mandatory "spatch" arguments from SPATCH_FLAGS
222
-
223
- Add Coccinelle rules to detect the pattern of initializing and then
224
- finalizing a structure without using it in between at all, which
225
- happens after code restructuring and the compilers fail to
226
- recognize as an unused variable.
227
- source: <cover-v4-0.6-00000000000-20220705T134033Z-avarab@gmail.com>
228
-
229
-
230
-* ab/leakfix (2022-07-01) 11 commits
231
- (merged to 'next' on 2022-07-11 at 0b107fffcf)
232
- + pull: fix a "struct oid_array" memory leak
233
- + cat-file: fix a common "struct object_context" memory leak
234
- + gc: fix a memory leak
235
- + checkout: avoid "struct unpack_trees_options" leak
236
- + merge-file: fix memory leaks on error path
237
- + merge-file: refactor for subsequent memory leak fix
238
- + cat-file: fix a memory leak in --batch-command mode
239
- + revert: free "struct replay_opts" members
240
- + submodule.c: free() memory from xgetcwd()
241
- + clone: fix memory leak in wanted_peer_refs()
242
- + check-ref-format: fix trivial memory leak
243
-
244
- Plug various memory leaks.
245
- source: <cover-v2-00.11-00000000000-20220701T104017Z-avarab@gmail.com>
246
-
247
-
248
-* ab/test-tool-leakfix (2022-07-01) 9 commits
249
- (merged to 'next' on 2022-07-11 at db7a724694)
250
- + test-tool delta: fix a memory leak
251
- + test-tool ref-store: fix a memory leak
252
- + test-tool bloom: fix memory leaks
253
- + test-tool json-writer: fix memory leaks
254
- + test-tool regex: call regfree(), fix memory leaks
255
- + test-tool urlmatch-normalization: fix a memory leak
256
- + test-tool {dump,scrap}-cache-tree: fix memory leaks
257
- + test-tool path-utils: fix a memory leak
258
- + test-tool test-hash: fix a memory leak
259
-
260
- Plug various memory leaks in test-tool commands.
261
- source: <cover-v2-0.9-00000000000-20220701T103503Z-avarab@gmail.com>
262
-
263
-
264
-* ab/test-without-templates (2022-06-06) 7 commits
265
- (merged to 'next' on 2022-07-11 at afab6c1918)
266
- + tests: don't assume a .git/info for .git/info/sparse-checkout
267
- + tests: don't assume a .git/info for .git/info/exclude
268
- + tests: don't assume a .git/info for .git/info/refs
269
- + tests: don't assume a .git/info for .git/info/attributes
270
- + tests: don't assume a .git/info for .git/info/grafts
271
- + tests: don't depend on template-created .git/branches
272
- + t0008: don't rely on default ".git/info/exclude"
273
-
274
- Tweak tests so that they still work when the "git init" template
275
- did not create .git/info directory.
276
- source: <cover-v2-0.7-00000000000-20220603T110506Z-avarab@gmail.com>
277
-
278
-
279
-* bc/nettle-sha256 (2022-07-10) 1 commit
280
- (merged to 'next' on 2022-07-11 at cf9595d8ca)
281
- + sha256: add support for Nettle
282
-
283
- Support for libnettle as SHA256 implementation has been added.
284
- source: <20220710132907.1499365-1-sandals@crustytoothpaste.net>
285
-
286
-
287
-* en/merge-dual-dir-renames-fix (2022-07-06) 5 commits
288
- (merged to 'next' on 2022-07-11 at 5f8dadf87b)
289
- + merge-ort: fix issue with dual rename and add/add conflict
290
- + merge-ort: shuffle the computation and cleanup of potential collisions
291
- + merge-ort: make a separate function for freeing struct collisions
292
- + merge-ort: small cleanups of check_for_directory_rename
293
- + t6423: add tests of dual directory rename plus add/add conflict
294
-
295
- Fixes a long-standing corner case bug around directory renames in
296
- the merge-ort strategy.
297
- source: <pull.1268.v4.git.1656984823.gitgitgadget@gmail.com>
298
-
299
-
300
-* fr/vimdiff-layout-fix (2022-07-08) 1 commit
301
- (merged to 'next' on 2022-07-09 at d8461bd236)
302
- + vimdiff: make layout engine more robust against user vim settings
303
-
304
- Recent update to vimdiff layout code has been made more robust
305
- against different end-user vim settings.
306
- source: <20220708181024.45839-1-greenfoo@u92.eu>
307
-
308
-
309
-* gc/submodule-use-super-prefix (2022-06-30) 8 commits
310
- (merged to 'next' on 2022-07-11 at 0d9cf172f9)
311
- + submodule--helper: remove display path helper
312
- + submodule--helper update: use --super-prefix
313
- + submodule--helper: remove unused SUPPORT_SUPER_PREFIX flags
314
- + submodule--helper: use correct display path helper
315
- + submodule--helper: don't recreate recursive prefix
316
- + submodule--helper update: use display path helper
317
- + submodule--helper tests: add missing "display path" coverage
318
- + Merge branch 'ab/submodule-cleanup' into gc/submodule-use-super-prefix
319
-
320
- Another step to rewrite more parts of "git submodule" in C.
321
- source: <20220701021157.88858-1-chooglen@google.com>
322
-
323
-
324
-* hx/lookup-commit-in-graph-fix (2022-07-12) 2 commits
325
- (merged to 'next' on 2022-07-13 at 4489696814)
326
- + t5330: remove run_with_limited_processses()
327
- (merged to 'next' on 2022-07-08 at cef32db0b6)
328
- + commit-graph.c: no lazy fetch in lookup_commit_in_graph()
329
-
330
- A corner case bug where lazily fetching objects from a promisor
331
- remote resulted in infinite recursion has been corrected.
332
- source: <cover.1656593279.git.hanxin.hx@bytedance.com>
333
-
334
-
335
-* jc/builtin-mv-move-array (2022-07-09) 1 commit
336
- (merged to 'next' on 2022-07-09 at 0d3b3f62e5)
337
- + builtin/mv.c: use the MOVE_ARRAY() macro instead of memmove()
338
-
339
- Apply Coccinelle rule to turn raw memmove() into MOVE_ARRAY() cpp
340
- macro, which would improve maintainability and readability.
341
- source: <xmqq4jzpu4xp.fsf_-_@gitster.g>
342
-
343
-
344
-* jc/resolve-undo (2022-07-11) 2 commits
345
- (merged to 'next' on 2022-07-13 at b9ef9482e8)
346
- + fsck: do not dereference NULL while checking resolve-undo data
347
- (merged to 'next' on 2022-06-15 at c195e5a2d9)
348
- + revision: mark blobs needed for resolve-undo as reachable
349
-
350
- The resolve-undo information in the index was not protected against
351
- GC, which has been corrected.
352
- source: <xmqq35f7kzad.fsf@gitster.g>
353
-
354
-
355
-* jd/gpg-interface-trust-level-string (2022-07-10) 1 commit
356
- (merged to 'next' on 2022-07-11 at 7b3cca73a8)
357
- + gpg-interface: add function for converting trust level to string
358
-
359
- The code to convert between GPG trust level strings and internal
360
- constants we use to represent them have been cleaned up.
361
- source: <pull.1281.v4.git.1657515650587.gitgitgadget@gmail.com>
362
-
363
-
364
-* jk/clone-unborn-confusion (2022-07-11) 4 commits
365
- (merged to 'next' on 2022-07-13 at a7ae8cb4b5)
366
- + clone: move unborn head creation to update_head()
367
- + clone: use remote branch if it matches default HEAD
368
- + clone: propagate empty remote HEAD even with other branches
369
- + clone: drop extra newline from warning message
370
-
371
- "git clone" from a repository with some ref whose HEAD is unborn
372
- did not set the HEAD in the resulting repository correctly, which
373
- has been corrected.
374
- source: <YsdyLS4UFzj0j/wB@coredump.intra.peff.net>
375
-
376
-
377
-* jk/diff-files-cleanup-fix (2022-07-12) 1 commit
378
- (merged to 'next' on 2022-07-13 at 9db5235d01)
379
- + diff-files: move misplaced cleanup label
380
-
381
- An earlier attempt to plug leaks placed a clean-up label to jump to
382
- at a bogus place, which as been corrected.
383
- source: <Ys0c0ePxPOqZ/5ck@coredump.intra.peff.net>
384
-
385
-
386
-* jk/ref-filter-discard-commit-buffer (2022-07-11) 1 commit
387
- (merged to 'next' on 2022-07-13 at d1521724db)
388
- + ref-filter: disable save_commit_buffer while traversing
389
-
390
- Will merge to 'master'.
391
- source: <Ysw4JtoHW1vWmqhz@coredump.intra.peff.net>
392
-
393
-
394
-* ll/curl-accept-language (2022-07-11) 1 commit
395
- (merged to 'next' on 2022-07-13 at 076aba7421)
396
- + remote-curl: send Accept-Language header to server
397
-
398
- Earlier, HTTP transport clients learned to tell the server side
399
- what locale they are in by sending Accept-Language HTTP header, but
400
- this was done only for some requests but not others.
401
- source: <pull.1251.v4.git.1657519134336.gitgitgadget@gmail.com>
402
-
403
-
404
-* rs/cocci-array-copy (2022-07-10) 1 commit
405
- (merged to 'next' on 2022-07-13 at f21dec0f71)
406
- + cocci: avoid normalization rules for memcpy
407
-
408
- A coccinelle rule (in contrib/) to encourage use of COPY_ARRAY
409
- macro has been improved.
410
- source: <ded153d4-4aea-d4da-11cb-ec66d181e4c9@web.de>
411
-
412
-
413
-* sg/multi-pack-index-parse-options-fix (2022-07-10) 1 commit
414
- (merged to 'next' on 2022-07-11 at 1e14685680)
415
- + multi-pack-index: simplify handling of unknown --options
416
-
417
- The way "git multi-pack" uses parse-options API has been improved.
418
- source: <20220710151645.GA2038@szeder.dev>
419
-
420
---------------------------------------------------
421
-[Stalled]
422
-
423
-* bc/stash-export (2022-04-08) 4 commits
424
- - builtin/stash: provide a way to import stashes from a ref
425
- - builtin/stash: provide a way to export stashes to a ref
426
- - builtin/stash: factor out revision parsing into a function
427
- - object-name: make get_oid quietly return an error
428
-
429
- A mechanism to export and import stash entries to and from a normal
430
- commit to transfer it across repositories has been introduced.
431
-
432
- Expecting a reroll.
433
- cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
434
- source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
435
-
436
-
437
-* cw/remote-object-info (2022-05-06) 11 commits
438
- - SQUASH??? coccicheck
439
- - SQUASH??? ensure that coccicheck is happy
440
- - SQUASH??? compilation fix
441
- - cat-file: add --batch-command remote-object-info command
442
- - cat-file: move parse_cmd and DEFAULT_FORMAT up
443
- - transport: add object-info fallback to fetch
444
- - transport: add client side capability to request object-info
445
- - object-info: send attribute packet regardless of object ids
446
- - object-store: add function to free object_info contents
447
- - fetch-pack: move fetch default settings
448
- - fetch-pack: refactor packet writing
449
-
450
- A client component to talk with the object-info endpoint.
451
-
452
- Expecting a reroll.
453
- source: <20220502170904.2770649-1-calvinwan@google.com>
454
-
455
---------------------------------------------------
456
-[Cooking]
457
-
458
-* js/ci-github-workflow-markup (2022-07-14) 1 commit
459
- (merged to 'next' on 2022-07-15 at 196166f671)
460
- + tests: fix incorrect --write-junit-xml code
461
-
462
- A fix for a regression in test framework.
463
-
464
- Will merge to 'master'.
465
- source: <pull.1288.git.1657789234416.gitgitgadget@gmail.com>
466
-
467
-
468
-* js/shortlog-sort-stably (2022-07-14) 1 commit
469
- (merged to 'next' on 2022-07-15 at 75e4efe678)
470
- + shortlog: use a stable sort
471
-
472
- "git shortlog -n" relied on the underlying qsort() to be stable,
473
- which shouldn't have. Fixed.
474
-
475
- Will merge to 'master'.
476
- source: <pull.1290.git.1657813429221.gitgitgadget@gmail.com>
380
+ Getting there.
381
+ source: <cover-v3-00.26-00000000000-20220721T191249Z-avarab@gmail.com>
382
383
384
* mt/doc-config (2022-07-14) 3 commits
@@ -490,16 +395,6 @@ Release tarballs are available at:
395
source: <cover.1657819649.git.matheus.bernardino@usp.br>
396
397
493
-* rs/mingw-tighten-mkstemp (2022-07-14) 1 commit
494
- (merged to 'next' on 2022-07-15 at 4dd4a117ec)
495
- + mingw: avoid mktemp() in mkstemp() implementation
496
-
497
- mkstemp() emulation on Windows has been improved.
498
-
499
- Will merge to 'master'.
500
- source: <7265e37f-fd29-3579-b840-19a1df52a59f@web.de>
501
-
502
-
398
* jt/fetch-pack-trace2-filter-spec (2022-07-18) 1 commit
399
- fetch-pack: write effective filter to trace2
400
@@ -549,37 +444,30 @@ Release tarballs are available at:
444
445
446
* ds/doc-wo-whitelist (2022-07-19) 5 commits
552
- - transport.c: avoid "whitelist"
553
- - t: avoid "whitelist"
554
- - git.txt: remove redundant language
555
- - git-cvsserver: clarify directory list
556
- - daemon: clarify directory arguments
447
+ (merged to 'next' on 2022-07-20 at ec51c6269a)
448
+ + transport.c: avoid "whitelist"
449
+ + t: avoid "whitelist"
450
+ + git.txt: remove redundant language
451
+ + git-cvsserver: clarify directory list
452
+ + daemon: clarify directory arguments
453
454
Avoid "white/black-list" in documentation and code comments.
455
560
- Will merge to 'next'.
561
- source: <pull.1274.v3.git.1658255537.gitgitgadget@gmail.com>
562
-
563
-
564
-* js/vimdiff-quotepath-fix (2022-07-14) 1 commit
565
- (merged to 'next' on 2022-07-15 at 4273bbd4b4)
566
- + mergetool(vimdiff): allow paths to contain spaces again
567
-
568
- Variable quoting fix in the vimdiff driver of "git mergetool"
569
-
456
Will merge to 'master'.
571
- source: <pull.1287.v2.git.1657809063728.gitgitgadget@gmail.com>
457
+ source: <pull.1274.v3.git.1658255537.gitgitgadget@gmail.com>
458
459
460
* mt/checkout-count-fix (2022-07-14) 3 commits
575
- - checkout: fix two bugs on the final count of updated entries
576
- - checkout: show bug about failed entries being included in final report
577
- - checkout: document bug where delayed checkout counts entries twice
461
+ (merged to 'next' on 2022-07-22 at 60c73a6b0b)
462
+ + checkout: fix two bugs on the final count of updated entries
463
+ + checkout: show bug about failed entries being included in final report
464
+ + checkout: document bug where delayed checkout counts entries twice
465
+ (this branch is used by mt/rot13-in-c.)
466
467
"git checkout" miscounted the paths it updated, which has been
468
corrected.
469
582
- Will merge to 'next'?
470
+ Will merge to 'master'.
471
source: <cover.1657799213.git.matheus.bernardino@usp.br>
472
473
@@ -627,9 +515,9 @@ Release tarballs are available at:
515
source: <pull.1282.git.1657385781.gitgitgadget@gmail.com>
516
517
630
-* ac/bitmap-lookup-table (2022-07-06) 6 commits
631
- - p5310-pack-bitmaps.sh: remove pack.writeReverseIndex
518
+* ac/bitmap-lookup-table (2022-07-20) 6 commits
519
- bitmap-lookup-table: add performance tests for lookup table
520
+ - p5310-pack-bitmaps.sh: enable `pack.writeReverseIndex`
521
- pack-bitmap: prepare to read lookup table extension
522
- pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests
523
- pack-bitmap-write.c: write lookup table extension
@@ -640,19 +528,20 @@ Release tarballs are available at:
528
529
Waiting for a more thorough review.
530
cf. <Ys4DjW9JjQFx5Bhb@nand.local>
643
- source: <pull.1266.v3.git.1656924376.gitgitgadget@gmail.com>
531
+ source: <pull.1266.v4.git.1658325913.gitgitgadget@gmail.com>
532
533
646
-* kk/p4-client-name-encoding-fix (2022-07-08) 1 commit
534
+* kk/p4-client-name-encoding-fix (2022-07-21) 2 commits
535
+ (merged to 'next' on 2022-07-21 at 008518b4e5)
536
+ + git-p4: refactoring of p4CmdList()
537
(merged to 'next' on 2022-07-11 at 9c18616f76)
538
+ git-p4: fix bug with encoding of p4 client name
539
540
"git p4" did not handle non-ASCII client name well, which has been
541
corrected.
542
653
- On hold, waiting for a follow-up.
654
- cf. <xmqqcze2s7h0.fsf@gitster.g>
655
- source: <pull.1285.git.git.1657267260405.gitgitgadget@gmail.com>
543
+ Will merge to 'master'.
544
+ source: <pull.1285.v3.git.git.1658394440.gitgitgadget@gmail.com>
545
546
547
* sa/cat-file-mailmap (2022-07-18) 4 commits
@@ -669,24 +558,25 @@ Release tarballs are available at:
558
559
560
* ds/rebase-update-ref (2022-07-19) 13 commits
672
- - sequencer: notify user of --update-refs activity
673
- - sequencer: ignore HEAD ref under --update-refs
674
- - rebase: add rebase.updateRefs config option
675
- - sequencer: rewrite update-refs as user edits todo list
676
- - rebase: update refs from 'update-ref' commands
677
- - rebase: add --update-refs option
678
- - sequencer: add update-ref command
679
- - sequencer: define array with enum values
680
- - rebase-interactive: update 'merge' description
681
- - branch: consider refs under 'update-refs'
682
- - t2407: test branches currently using apply backend
683
- - t2407: test bisect and rebase as black-boxes
684
- - Merge branch 'ds/branch-checked-out' into ds/rebase-update-ref
561
+ (merged to 'next' on 2022-07-20 at 9f4bf9ef6c)
562
+ + sequencer: notify user of --update-refs activity
563
+ + sequencer: ignore HEAD ref under --update-refs
564
+ + rebase: add rebase.updateRefs config option
565
+ + sequencer: rewrite update-refs as user edits todo list
566
+ + rebase: update refs from 'update-ref' commands
567
+ + rebase: add --update-refs option
568
+ + sequencer: add update-ref command
569
+ + sequencer: define array with enum values
570
+ + rebase-interactive: update 'merge' description
571
+ + branch: consider refs under 'update-refs'
572
+ + t2407: test branches currently using apply backend
573
+ + t2407: test bisect and rebase as black-boxes
574
+ + Merge branch 'ds/branch-checked-out' into ds/rebase-update-ref
575
576
"git rebase -i" learns to update branches whose tip appear in the
577
rebased range.
578
689
- Will merge to 'next'?
579
+ Will merge to 'master'.
580
source: <pull.1247.v5.git.1658255624.gitgitgadget@gmail.com>
581
582
@@ -713,41 +603,30 @@ Release tarballs are available at:
603
source: <patch-v3-1.1-979dea5956a-20220718T102747Z-avarab@gmail.com>
604
605
716
-* en/merge-restore-to-pristine (2022-06-21) 6 commits
606
+* en/merge-restore-to-pristine (2022-07-21) 7 commits
607
- merge: do not exit restore_state() prematurely
608
- merge: ensure we can actually restore pre-merge state
609
- merge: make restore_state() restore staged state too
720
- - merge: fix save_state() to work when there are racy-dirty files
721
- - merge: remove unused variable
722
- - t6424: make sure a failed merge preserves local changes
610
+ - merge: fix save_state() to work when there are stat-dirty files
611
+ - merge: do not abort early if one strategy fails to handle the merge
612
+ - merge-resolve: abort if index does not match HEAD
613
+ - merge-ort-wrappers: make printed message match the one from recursive
614
615
When "git merge" finds that it cannot perform a merge, it should
616
restore the working tree to the state before the command was
617
initiated, but in some corner cases it didn't.
618
728
- Under review.
729
- source: <pull.1231.v2.git.1655621424.gitgitgadget@gmail.com>
730
-
731
-
732
-* tk/apply-case-insensitive (2022-06-21) 3 commits
733
- - apply: support case-only renames in case-insensitive filesystems
734
- - reset: new failing test for reset of case-insensitive duplicate in index
735
- - t4141: test "git apply" with core.ignorecase
736
-
737
- "git apply" barfed on a patch that makes a case-only rename on a
738
- case-insensitive filesystem.
739
-
740
- Needs review.
741
- source: <pull.1257.v2.git.1655655027.gitgitgadget@gmail.com>
619
+ Will merge to 'next'?
620
+ source: <pull.1231.v3.git.1658391391.gitgitgadget@gmail.com>
621
622
744
-* zh/ls-files-format (2022-07-13) 1 commit
623
+* zh/ls-files-format (2022-07-20) 1 commit
624
- ls-files: introduce "--format" option
625
626
"git ls-files" learns the "--format" option to tweak its output.
627
628
Will merge to 'next'?
750
- source: <pull.1262.v7.git.1657692472994.gitgitgadget@gmail.com>
629
+ source: <pull.1262.v8.git.1658334983053.gitgitgadget@gmail.com>
630
631
632
* js/commit-graph-parsing-without-repo-settings (2022-07-14) 1 commit
@@ -823,21 +702,6 @@ Release tarballs are available at:
702
cf. <20627.86ilolhnnn.gmgdl@evledraar.gmail.com>
703
source: <pull.1132.v4.git.1656354677.gitgitgadget@gmail.com>
704
826
-
827
-* gc/bare-repo-discovery (2022-07-14) 5 commits
828
- (merged to 'next' on 2022-07-15 at 5206577852)
829
- + setup.c: create `safe.bareRepository`
830
- + safe.directory: use git_protected_config()
831
- + config: learn `git_protected_config()`
832
- + Documentation: define protected configuration
833
- + Documentation/git-config.txt: add SCOPES section
834
-
835
- Introduce a discovery.barerepository configuration variable that
836
- allows users to forbid discovery of bare repositories.
837
-
838
- Will merge to 'master'.
839
- source: <pull.1261.v8.git.git.1657834081.gitgitgadget@gmail.com>
840
-
705
--------------------------------------------------
706
[Discarded]
707