What's cooking (2021/08 #10)
Junio C Hamano committed
Aug 31, 2021 at 15:03 UTC
a2bf769eb4df7fcc70dd30e0034fd2aa2bc01b82
1 file changed
+371
-415
whats-cooking.txt
+371
-415
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Aug 2021, #09; Sun, 29)
4
-X-master-at: c4203212e360b25a1c69467b5a8437d45a373cac
5
-X-next-at: ba50c8fa2411f9e6a5c9ec9617eca2637ef4e4cb
3
+Subject: What's cooking in git.git (Aug 2021, #10; Tue, 31)
4
+X-master-at: 6c40894d2466d4e7fddc047a05116aa9d14712ee
5
+X-next-at: f2128466b98f6f7214f448ad9ae8252811cadb24
6
7
-What's cooking in git.git (Aug 2021, #09; Sun, 29)
7
+What's cooking in git.git (Aug 2021, #10; Tue, 31)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -18,18 +18,10 @@ useful"). Do not read too much into a topic being in (or not in)
18
'seen'. The ones marked with '.' do not appear in any of the
19
integration branches, but I am still holding onto them.
20
21
-The first batch of topics for the new cycle are now in 'master'.
22
-The second batch will primarily be to graduate 'ort' as the
23
-default.
24
-
25
-I've been a bit under the weather during the last week and wanted to
26
-concentrate on what to push out to 'master', so while I may have
27
-picked up new topics and replaced existing topics with their new
28
-versions, I haven't added or updated my summaries on their doneness
29
-to this document. Help is appreciated.
30
-
31
-There also may be other patches sent to the list that I haven't
32
-looked at, whether they were reviewed by others or not.
21
+Now 'merge -sort' is the default two-head merge strategy on the
22
+'master' front. Older topics that are not in 'seen' need help from
23
+readers to be sifted into bins for 'next' and the remainder to be
24
+kicked back to the authors.
25
26
Copies of the source code to Git live in many repositories, and the
27
following is a list of the ones I push into or their mirrors. Some
@@ -62,174 +54,334 @@ Release tarballs are available at:
54
--------------------------------------------------
55
[Graduated to 'master']
56
65
-* ab/bundle-doc (2021-08-02) 4 commits
66
- (merged to 'next' on 2021-08-23 at af25d34e71)
67
- + bundle doc: replace "basis" with "prerequsite(s)"
68
- + bundle doc: elaborate on rev<->ref restriction
69
- + bundle doc: elaborate on object prerequisites
70
- + bundle doc: rewrite the "DESCRIPTION" section
57
+* bc/t5607-avoid-broken-test-fail-prereqs (2021-08-11) 1 commit
58
+ (merged to 'next' on 2021-08-24 at 66c1e510ff)
59
+ + t5607: avoid using prerequisites to select algorithm
60
72
- Originally merged to 'next' on 2021-08-04
61
+ The current implementation of GIT_TEST_FAIL_PREREQS is broken in
62
+ that checking for the lack of a prerequisite would not work. Avoid
63
+ the use of "if ! test_have_prereq X" in a test script.
64
74
- Doc update.
65
66
+* cb/builtin-merge-format-string-fix (2021-08-09) 1 commit
67
+ (merged to 'next' on 2021-08-24 at 6e94c19f1e)
68
+ + builtin/merge: avoid -Wformat-extra-args from ancient Xcode
69
77
-* ab/http-drop-old-curl (2021-07-30) 5 commits
78
- (merged to 'next' on 2021-08-23 at 70188594a0)
79
- + http: rename CURLOPT_FILE to CURLOPT_WRITEDATA
80
- + http: drop support for curl < 7.19.3 and < 7.17.0 (again)
81
- + http: drop support for curl < 7.19.4
82
- + http: drop support for curl < 7.16.0
83
- + http: drop support for curl < 7.11.1
70
+ Code clean-up.
71
85
- Originally merged to 'next' on 2021-08-02
72
87
- Support for ancient versions of cURL library has been dropped.
73
+* cb/ci-freebsd-update (2021-08-12) 1 commit
74
+ (merged to 'next' on 2021-08-24 at 1ecf63af7d)
75
+ + ci: update freebsd 12 cirrus job
76
77
+ Update FreeBSD CI job
78
90
-* ab/pack-stdin-packs-fix (2021-07-09) 2 commits
91
- (merged to 'next' on 2021-08-23 at ec9d0ba95f)
92
- + pack-objects: fix segfault in --stdin-packs option
93
- + pack-objects tests: cover blindspots in stdin handling
79
95
- Originally merged to 'next' on 2021-08-04
80
+* en/merge-strategy-docs (2021-08-05) 10 commits
81
+ (merged to 'next' on 2021-08-24 at ceb66b1062)
82
+ + Update error message and code comment
83
+ + merge-strategies.txt: add coverage of the `ort` merge strategy
84
+ + git-rebase.txt: correct out-of-date and misleading text about renames
85
+ + merge-strategies.txt: fix simple capitalization error
86
+ + merge-strategies.txt: avoid giving special preference to patience algorithm
87
+ + merge-strategies.txt: do not imply using copy detection is desired
88
+ + merge-strategies.txt: update wording for the resolve strategy
89
+ + Documentation: edit awkward references to `git merge-recursive`
90
+ + directory-rename-detection.txt: small updates due to merge-ort optimizations
91
+ + git-rebase.txt: correct antiquated claims about --rebase-merges
92
+ (this branch is used by en/ort-becomes-the-default.)
93
97
- Input validation of "git pack-objects --stdin-packs" has been
98
- corrected.
94
+ Documentation updates.
95
96
101
-* ds/add-with-sparse-index (2021-07-29) 5 commits
102
- (merged to 'next' on 2021-08-23 at 179c4747ac)
103
- + add: remove ensure_full_index() with --renormalize
104
- + add: ignore outside the sparse-checkout in refresh()
105
- + pathspec: stop calling ensure_full_index
106
- + add: allow operating on a sparse-only index
107
- + t1092: test merge conflicts outside cone
108
- (this branch is used by ds/sparse-index-ignored-files.)
97
+* en/ort-becomes-the-default (2021-08-05) 2 commits
98
+ (merged to 'next' on 2021-08-24 at 92f4e08d83)
99
+ + Update docs for change of default merge backend
100
+ + Change default merge backend from recursive to ort
101
+ (this branch uses en/merge-strategy-docs.)
102
110
- Originally merged to 'next' on 2021-08-02
103
+ Use `ort` instead of `recursive` as the default merge strategy.
104
112
- "git add" can work better with the sparse index.
105
106
+* en/pull-conflicting-options (2021-07-22) 8 commits
107
+ (merged to 'next' on 2021-08-24 at e1e5b2c551)
108
+ + pull: fix handling of multiple heads
109
+ + pull: update docs & code for option compatibility with rebasing
110
+ + pull: abort by default when fast-forwarding is not possible
111
+ + pull: make --rebase and --no-rebase override pull.ff=only
112
+ + pull: since --ff-only overrides, handle it first
113
+ + pull: abort if --ff-only is given and fast-forwarding is impossible
114
+ + t7601: add tests of interactions with multiple merge heads and config
115
+ + t7601: test interaction of merge/rebase/fast-forward flags and options
116
115
-* en/ort-perf-batch-15 (2021-08-03) 9 commits
116
- (merged to 'next' on 2021-08-23 at d22a850986)
117
- + merge-ort: remove compile-time ability to turn off usage of memory pools
118
- + merge-ort: reuse path strings in pool_alloc_filespec
119
- + merge-ort: store filepairs and filespecs in our mem_pool
120
- + diffcore-rename, merge-ort: add wrapper functions for filepair alloc/dealloc
121
- + merge-ort: switch our strmaps over to using memory pools
122
- + merge-ort: set up a memory pool
123
- + merge-ort: add pool_alloc, pool_calloc, and pool_strndup wrappers
124
- + diffcore-rename: use a mem_pool for exact rename detection's hashmap
125
- + merge-ort: rename str{map,intmap,set}_func()
117
+ "git pull" had various corner cases that were not well thought out
118
+ around its --rebase backend, e.g. "git pull --ff-only" did not stop
119
+ but went ahead and rebased when the history on other side is not a
120
+ descendant of our history. The series tries to fix them up.
121
127
- Originally merged to 'next' on 2021-08-04
122
129
- Final batch for "merge -sort" optimization.
123
+* jc/userdiff-pattern-hint (2021-08-11) 1 commit
124
+ (merged to 'next' on 2021-08-24 at f29f51148f)
125
+ + userdiff: comment on the builtin patterns
126
127
+ Remind developers that the userdiff patterns should be kept simple
128
+ and permissive, assuming that the contents they apply are always
129
+ syntactically correct.
130
132
-* es/trace2-log-parent-process-name (2021-07-22) 2 commits
133
- (merged to 'next' on 2021-08-23 at a93182081d)
134
- + tr2: log parent process name
135
- + tr2: make process info collection platform-generic
131
137
- Originally merged to 'next' on 2021-08-04
132
+* jk/apply-binary-hunk-parsing-fix (2021-08-10) 1 commit
133
+ (merged to 'next' on 2021-08-24 at c786cd1e8b)
134
+ + apply: keep buffer/size pair in sync when parsing binary hunks
135
+
136
+ "git apply" miscounted the bytes and failed to read to the end of
137
+ binary hunks.
138
+
139
+
140
+* jk/range-diff-fixes (2021-08-10) 3 commits
141
+ (merged to 'next' on 2021-08-24 at eff05f579e)
142
+ + range-diff: use ssize_t for parsed "len" in read_patches()
143
+ + range-diff: handle unterminated lines in read_patches()
144
+ + range-diff: drop useless "offset" variable from read_patches()
145
139
- trace2 logs learned to show parent process name to see in what
140
- context Git was invoked.
146
+ "git range-diff" code clean-up.
147
148
143
-* hn/refs-test-cleanup (2021-08-02) 11 commits
144
- (merged to 'next' on 2021-08-23 at 96fe62cbc1)
145
- + t6001: avoid direct file system access
146
- + t6500: use "ls -1" to snapshot ref database state
147
- + t7064: use update-ref -d to remove upstream branch
148
- + t1410: mark test as REFFILES
149
- + t1405: mark test for 'git pack-refs' as REFFILES
150
- + t1405: use 'git reflog exists' to check reflog existence
151
- + t2402: use ref-store test helper to create broken symlink
152
- + t3320: use git-symbolic-ref rather than filesystem access
153
- + t6120: use git-update-ref rather than filesystem access
154
- + t1503: mark symlink test as REFFILES
155
- + t6050: use git-update-ref rather than filesystem access
149
+* js/log-protocol-version (2021-08-10) 1 commit
150
+ (merged to 'next' on 2021-08-24 at aeeaee04fb)
151
+ + connect, protocol: log negotiated protocol version
152
157
- Originally merged to 'next' on 2021-08-04
153
+ Debugging aid.
154
159
- A handful of tests that assumed implementation details of files
160
- backend for refs have been cleaned up.
155
156
+* th/userdiff-more-java (2021-08-11) 1 commit
157
+ (merged to 'next' on 2021-08-24 at a5617abd3e)
158
+ + userdiff: improve java hunk header regex
159
163
-* jc/bisect-sans-show-branch (2021-07-28) 2 commits
164
- (merged to 'next' on 2021-08-23 at 4d01043b2e)
165
- + bisect: simplify return code from bisect_checkout()
166
- + bisect: do not run show-branch just to show the current commit
160
+ The userdiff pattern for "java" language has been updated.
161
168
- Originally merged to 'next' on 2021-08-02
162
170
- "git bisect" spawned "git show-branch" only to pretty-print the
171
- title of the commit after checking out the next version to be
172
- tested; this has been rewritten in C.
163
+* tl/traverse-non-commits-rename (2021-08-12) 1 commit
164
+ (merged to 'next' on 2021-08-24 at 55cc85c20a)
165
+ + list-objects.c: rename "traverse_trees_and_blobs" to "traverse_non_commits"
166
167
+ Meh.
168
175
-* js/expand-runtime-prefix (2021-07-26) 6 commits
176
- (merged to 'next' on 2021-08-23 at cf274b0177)
177
- + expand_user_path: allow in-flight topics to keep using the old name
178
- + interpolate_path(): allow specifying paths relative to the runtime prefix
179
- + Use a better name for the function interpolating paths
180
- + expand_user_path(): clarify the role of the `real_home` parameter
181
- + expand_user_path(): remove stale part of the comment
182
- + tests: exercise the RUNTIME_PREFIX feature
169
+--------------------------------------------------
170
+[New Topics]
171
184
- Originally merged to 'next' on 2021-08-04
172
+* tb/add-objects-in-unpacked-packs-simplify (2021-08-29) 3 commits
173
+ - builtin/pack-objects.c: remove duplicate hash lookup
174
+ - builtin/pack-objects.c: simplify add_objects_in_unpacked_packs()
175
+ - object-store.h: teach for_each_packed_object to ignore kept packs
176
186
- Pathname expansion (like "~username/") learned a way to specify a
187
- location relative to Git installation (e.g. its $sharedir which is
188
- $(prefix)/share), with "%(prefix)".
177
+ Code simplification with reduced memory usage.
178
179
+ Will merge to 'next'.
180
191
-* jt/push-negotiation-fixes (2021-07-15) 3 commits
192
- (merged to 'next' on 2021-08-23 at 6b3dcc1092)
193
- + fetch: die on invalid --negotiation-tip hash
194
- + send-pack: fix push nego. when remote has refs
195
- + send-pack: fix push.negotiate with remote helper
181
197
- Originally merged to 'next' on 2021-08-09
182
+* es/walken-tutorial-fix (2021-08-30) 1 commit
183
+ - doc: fix syntax error and the format of printf
184
199
- Bugfix for common ancestor negotiation recently introduced in "git
200
- push" codepath.
185
+ Typofix.
186
187
+ Will merge to 'next'.
188
203
-* ps/fetch-pack-load-refs-optim (2021-08-04) 1 commit
204
- (merged to 'next' on 2021-08-23 at 09f9fbdd9f)
205
- + fetch-pack: speed up loading of refs via commit graph
189
207
- Originally merged to 'next' on 2021-08-09
190
+* jh/sparse-index-resize-fix (2021-08-30) 1 commit
191
+ - sparse-index: copy dir_hash in ensure_full_index()
192
209
- Loading of ref tips to prepare for common ancestry negotiation in
210
- "git fetch-pack" has been optimized by taking advantage of the
211
- commit graph when available.
193
+ The sparse-index support can corrupt the index structure by storing
194
+ a stale and/or uninitialized data, which has been corrected.
195
196
+ Will merge to 'next'.
197
214
-* zh/ref-filter-raw-data (2021-07-26) 6 commits
215
- (merged to 'next' on 2021-08-23 at 5c06fb48a5)
216
- + ref-filter: add %(rest) atom
217
- + ref-filter: use non-const ref_format in *_atom_parser()
218
- + ref-filter: --format=%(raw) support --perl
219
- + ref-filter: add %(raw) atom
220
- + ref-filter: add obj-type check in grab contents
221
- + Merge branch 'zh/cat-file-batch-fix' into zh/ref-filter-raw-data
198
223
- Originally merged to 'next' on 2021-08-04
199
+* mh/send-email-reset-in-reply-to (2021-08-30) 1 commit
200
+ - send-email: avoid incorrect header propagation
201
+
202
+ Even when running "git send-email" without its own threaded
203
+ discussion support, a threading related header in one message is
204
+ carried over to the subsequent message to result in an unwanted
205
+ threading, which has been corrected.
206
+
207
+ Will merge to 'next'.
208
+
209
+
210
+* rs/more-fspathcmp (2021-08-30) 1 commit
211
+ - merge-recursive: use fspathcmp() in path_hashmap_cmp()
212
+
213
+ Code simplification.
214
+
215
+ Will merge to 'next'.
216
+
217
+
218
+* sg/set-ceiling-during-tests (2021-08-30) 1 commit
219
+ - test-lib: set GIT_CEILING_DIRECTORIES to protect the surrounding repository
220
+
221
+ Buggy tests could damage repositories outside the throw-away test
222
+ area we created. We now by default export GIT_CEILING_DIRECTORIES
223
+ to limit the damage from such a stray test.
224
+
225
+ Will merge to 'next'.
226
+
227
+
228
+* ab/gc-log-rephrase (2021-08-31) 1 commit
229
+ - gc: remove trailing dot from "gc.log" line
230
+ (this branch uses uk/userdiff-php-enum.)
231
+
232
+ A pathname in an advice message has been made cut-and-paste ready.
233
+
234
+ Will merge to 'next'?
235
+
236
+
237
+* ab/mailmap-leakfix (2021-08-31) 1 commit
238
+ - mailmap.c: fix a memory leak in free_mailap_{info,entry}()
239
+
240
+ Leakfix.
241
+
242
+ Will merge to 'next'.
243
+
244
+
245
+* ba/object-info (2021-08-31) 1 commit
246
+ - protocol-caps.c: fix memory leak in send_info()
247
+
248
+ Leakfix.
249
+
250
+ Will merge to 'next'.
251
+
252
+
253
+* en/remerge-diff (2021-08-31) 7 commits
254
+ - doc/diff-options: explain the new --remerge-diff option
255
+ - show, log: provide a --remerge-diff capability
256
+ - tmp-objdir: new API for creating and removing primary object dirs
257
+ - merge-ort: capture and print ll-merge warnings in our preferred fashion
258
+ - ll-merge: add API for capturing warnings in a strbuf instead of stderr
259
+ - merge-ort: add ability to record conflict messages in a file
260
+ - merge-ort: mark a few more conflict messages as omittable
261
+
262
+ A new presentation for two-parent merge "--remerge-diff" can be
263
+ used to show the difference between mechanical (and possibly
264
+ conflicted) merge results and the recorded resolution.
265
225
- Prepare the "ref-filter" machinery that drives the "--format"
226
- option of "git for-each-ref" and its friends to be used in "git
227
- cat-file --batch".
266
+
267
+* sg/test-split-index-fix (2021-08-31) 7 commits
268
+ - read-cache: fix GIT_TEST_SPLIT_INDEX
269
+ - tests: disable GIT_TEST_SPLIT_INDEX for sparse index tests
270
+ - read-cache: look for shared index files next to the index, too
271
+ - t1600-index: disable GIT_TEST_SPLIT_INDEX
272
+ - t1600-index: don't run git commands upstream of a pipe
273
+ - t1600-index: remove unnecessary redirection
274
+ - Merge branch 'ds/sparse-index-ignored-files' into sg/test-split-index-fix
275
+ (this branch uses ds/sparse-index-ignored-files.)
276
+
277
+ Test updates.
278
+
279
+
280
+* tk/fast-export-anonymized-tag-fix (2021-08-31) 1 commit
281
+ - fast-export: fix anonymized tag using original length
282
+
283
+ The output from "git fast-export", when its anonymization feature
284
+ is in use, showed an annotated tag incorrectly.
285
+
286
+ Will merge to 'next'.
287
+
288
+
289
+* uk/userdiff-php-enum (2021-08-31) 1 commit
290
+ - userdiff: support enum keyword in PHP hunk header
291
+ (this branch is used by ab/gc-log-rephrase.)
292
+
293
+ Update the userdiff pattern for PHP.
294
+
295
+ Will merge to 'next'.
296
297
--------------------------------------------------
230
-[New Topics]
298
+[Stalled]
299
+
300
+* gh/gitweb-branch-sort (2021-06-10) 1 commit
301
+ - gitweb: use HEAD as secondary sort key in git_get_heads_list()
302
+
303
+ Tie-break branches that point at the same object in the list of
304
+ branches on GitWeb to show the one pointed at by HEAD early.
305
+
306
+ Waiting for reviews.
307
+
308
+
309
+* es/superproject-aware-submodules (2021-08-19) 5 commits
310
+ - fixup! introduce submodule.superprojectGitDir record
311
+ - submodule: record superproject gitdir during 'update'
312
+ - submodule: record superproject gitdir during absorbgitdirs
313
+ - introduce submodule.superprojectGitDir record
314
+ - t7400-submodule-basic: modernize inspect() helper
315
232
-* ab/commit-graph-usage (2021-08-25) 7 commits
316
+ A configuration variable in a submodule points at the location of
317
+ the superproject it is bound to (RFC).
318
+
319
+ Looking good.
320
+
321
+
322
+* en/zdiff3 (2021-06-15) 2 commits
323
+ - update documentation for new zdiff3 conflictStyle
324
+ - xdiff: implement a zealous diff3, or "zdiff3"
325
+
326
+ "Zealous diff3" style of merge conflict presentation has been added.
327
+
328
+ Expecting a reroll.
329
+ cf. <CABPp-BE7-E03+x38EK-=AE5mwwdST+d50hiiud2eY2Nsf3rM5g@mail.gmail.com>
330
+
331
+
332
+* ao/p4-avoid-decoding (2021-04-12) 2 commits
333
+ - git-p4: do not decode data from perforce by default
334
+ - git-p4: avoid decoding more data from perforce
335
+
336
+ "git p4" in Python-2 days used to accept a lot more kinds of data
337
+ from Perforce server as uninterrupted byte sequence, but after
338
+ switching to Python-3, too many things are expected to be in UTF-8,
339
+ which broke traditional use cases.
340
+
341
+ Waiting for reviews.
342
+
343
+
344
+* tv/p4-fallback-encoding (2021-04-30) 1 commit
345
+ - git-p4: git-p4.fallbackEncoding to specify non UTF-8 charset
346
+
347
+ "git p4" learns the fallbackEncoding configuration variable to
348
+ safely accept changeset descriptions that aren't written in UTF-8.
349
+
350
+ Waiting for reviews.
351
+
352
+
353
+* ab/fsck-unexpected-type (2021-07-12) 21 commits
354
+ - fsck: report invalid object type-path combinations
355
+ - fsck: report invalid types recorded in objects
356
+ - object-store.h: move read_loose_object() below 'struct object_info'
357
+ - fsck: don't hard die on invalid object types
358
+ - object-file.c: return -2 on "header too long" in unpack_loose_header()
359
+ - object-file.c: return -1, not "status" from unpack_loose_header()
360
+ - object-file.c: guard against future bugs in loose_object_info()
361
+ - object-file.c: stop dying in parse_loose_header()
362
+ - object-file.c: split up ternary in parse_loose_header()
363
+ - object-file.c: simplify unpack_loose_short_header()
364
+ - object-file.c: add missing braces to loose_object_info()
365
+ - object-file.c: make parse_loose_header_extended() public
366
+ - object-file.c: don't set "typep" when returning non-zero
367
+ - cache.h: move object functions to object-store.h
368
+ - cat-file tests: test for current --allow-unknown-type behavior
369
+ - cat-file tests: add corrupt loose object test
370
+ - rev-list tests: test for behavior with invalid object types
371
+ - cat-file tests: test that --allow-unknown-type isn't on by default
372
+ - cat-file tests: test for missing object with -t and -s
373
+ - fsck tests: add test for fsck-ing an unknown type
374
+ - fsck tests: refactor one test to use a sub-repo
375
+
376
+ "git fsck" has been taught to report mismatch between expected and
377
+ actual types of an object better.
378
+
379
+ Needs review.
380
+
381
+--------------------------------------------------
382
+[Cooking]
383
+
384
+* ab/commit-graph-usage (2021-08-30) 7 commits
385
- commit-graph: show "unexpected subcommand" error
386
- commit-graph: show usage on "commit-graph [write|verify] garbage"
387
- commit-graph: early exit to "usage" on !argc
@@ -238,21 +390,27 @@ Release tarballs are available at:
390
- commit-graph: remove redundant handling of -h
391
- commit-graph: define common usage with a macro
392
393
+ Fixes on usage message from "git commit-graph".
394
+
395
+ Will merge to 'next'.
396
+
397
398
* ab/ls-remote-packet-trace (2021-08-24) 1 commit
243
- - ls-remote: set packet_trace_identity(<name>)
399
+ (merged to 'next' on 2021-08-30 at fec2e5a7eb)
400
+ + ls-remote: set packet_trace_identity(<name>)
401
402
Debugging aid fix.
403
247
- Will merge to 'next'.
404
+ Will merge to 'master'.
405
406
407
* ab/rebase-fatal-fatal-fix (2021-08-24) 1 commit
251
- - rebase: emit one "fatal" in "fatal: fatal: <error>"
408
+ (merged to 'next' on 2021-08-30 at 256e1cbc9e)
409
+ + rebase: emit one "fatal" in "fatal: fatal: <error>"
410
411
Error message fix.
412
255
- Will merge to 'next'.
413
+ Will merge to 'master'.
414
415
416
* ab/refs-errno-cleanup (2021-08-25) 4 commits
@@ -274,35 +432,36 @@ Release tarballs are available at:
432
Code clean up to migrate callers from older advice_config[] based
433
API to newer advice_if_enabled() and advice_enabled() API.
434
277
- Want to merge to 'next' but a tree-wide change like this can
278
- interfere other topics in flight, so I'll need to block some time
279
- to see how safe it is to proceed before we can do so.
435
+ Will merge to 'next'.
436
437
438
* dd/diff-files-unmerged-fix (2021-08-25) 1 commit
283
- - diff-lib: ignore paths that are outside $cwd if --relative asked
439
+ (merged to 'next' on 2021-08-30 at 63a1bdddfc)
440
+ + diff-lib: ignore paths that are outside $cwd if --relative asked
441
442
"git diff --relative" segfaulted and/or produced incorrect result
443
when there are unmerged paths.
444
288
- Will merge to 'next'.
445
+ Will merge to 'master'.
446
447
448
* dd/t6300-wo-gpg-fix (2021-08-25) 2 commits
292
- - t6300: check for cat-file exit status code
293
- - t6300: don't run cat-file on non-existent object
449
+ (merged to 'next' on 2021-08-30 at 59f5669dd6)
450
+ + t6300: check for cat-file exit status code
451
+ + t6300: don't run cat-file on non-existent object
452
453
Test fix.
454
297
- Will merge to 'next'.
455
+ Will merge to 'master'.
456
457
458
* ga/send-email-sendmail-cmd (2021-08-24) 1 commit
301
- - t9001: PATH must not use Windows-style paths
459
+ (merged to 'next' on 2021-08-30 at 1bb659c66c)
460
+ + t9001: PATH must not use Windows-style paths
461
462
Test fix.
463
305
- Will merge to 'next'.
464
+ Will merge to 'master'.
465
466
467
* jb/midx-revindex-fix (2021-08-23) 1 commit
@@ -318,110 +477,119 @@ Release tarballs are available at:
477
478
479
* jk/t5323-no-pack-test-fix (2021-08-25) 1 commit
321
- - t5323: drop mentions of "master"
480
+ (merged to 'next' on 2021-08-30 at 2892635eaf)
481
+ + t5323: drop mentions of "master"
482
483
Test fix.
484
325
- Will merge to 'next'.
485
+ Will merge to 'master'.
486
487
488
* js/maintenance-launchctl-fix (2021-08-24) 2 commits
329
- - maintenance: skip bootout/bootstrap when plist is registered
330
- - maintenance: create `launchctl` configuration using a lock file
489
+ (merged to 'next' on 2021-08-30 at 12a5da47e7)
490
+ + maintenance: skip bootout/bootstrap when plist is registered
491
+ + maintenance: create `launchctl` configuration using a lock file
492
493
"git maintenance" scheduler fix for macOS.
494
334
- Will merge to 'next'.
495
+ Will merge to 'master'.
496
497
337
-* jv/pkt-line-batch (2021-08-26) 2 commits
498
+* jv/pkt-line-batch (2021-08-31) 2 commits
499
- upload-pack: use stdio in send_ref callbacks
339
- - pkt-line: add packet_fwrite
500
+ - pkt-line: add stdio packet write functions
501
502
Reduce number of write(2) system calls while sending the
503
ref advertisement.
504
344
- Expecting a reroll.
505
+ Will merge to 'next'?
506
507
508
* me/t5582-cleanup (2021-08-24) 1 commit
348
- - t5582: remove spurious 'cd "$D"' line
509
+ (merged to 'next' on 2021-08-30 at e92258e72c)
510
+ + t5582: remove spurious 'cd "$D"' line
511
512
Test fix.
513
352
- Will merge to 'next'.
514
+ Will merge to 'master'.
515
516
517
* mh/credential-leakfix (2021-08-25) 1 commit
356
- - credential: fix leak in credential_apply_config()
518
+ (merged to 'next' on 2021-08-30 at be9e67bddc)
519
+ + credential: fix leak in credential_apply_config()
520
521
Leak fix.
522
360
- Will merge to 'next'.
523
+ Will merge to 'master'.
524
525
526
* mt/quiet-with-delayed-checkout (2021-08-26) 1 commit
364
- - checkout: make delayed checkout respect --quiet and --no-progress
527
+ (merged to 'next' on 2021-08-30 at d243498893)
528
+ + checkout: make delayed checkout respect --quiet and --no-progress
529
530
The delayed checkout code path in "git checkout" etc. were chatty
531
even when --quiet and/or --no-progress options were given.
532
369
- Will merge to 'next'.
533
+ Will merge to 'master'.
534
535
372
-* ps/fetch-omit-formatting-under-quiet (2021-08-25) 1 commit
536
+* ps/fetch-omit-formatting-under-quiet (2021-08-30) 1 commit
537
- fetch: skip formatting updated refs with `--quiet`
538
539
"git fetch --quiet" optimization to avoid useless computation of
540
info that will never be displayed.
541
378
- Expecting a reroll.
379
- cf. <xmqqo89lid59.fsf@gitster.g>
542
+ Will merge to 'next'.
543
544
545
* ps/ls-refs-strbuf-optim (2021-08-25) 1 commit
383
- - ls-refs: reuse buffer when sending refs
546
+ (merged to 'next' on 2021-08-30 at e4cbc7243a)
547
+ + ls-refs: reuse buffer when sending refs
548
549
Micro-optimization for the wire protocol driver.
550
387
- Will merge to 'next'.
551
+ Will merge to 'master'.
552
553
554
* rs/branch-allow-deleting-dangling (2021-08-27) 1 commit
391
- - branch: allow deleting dangling branches with --force
555
+ (merged to 'next' on 2021-08-30 at 35b9d158e8)
556
+ + branch: allow deleting dangling branches with --force
557
558
"git branch -D <branch>" used to refuse to remove a broken branch
559
ref that points at a missing commit, which has been corrected.
560
396
- Will merge to 'next'.
561
+ Will merge to 'master'.
562
563
564
* rs/git-mmap-uses-malloc (2021-08-24) 1 commit
400
- - compat: let git_mmap use malloc(3) directly
565
+ (merged to 'next' on 2021-08-30 at 6339c8e657)
566
+ + compat: let git_mmap use malloc(3) directly
567
568
mmap() imitation used to call xmalloc() that dies upon malloc()
569
failure, which has been corrected to just return an error to the
570
caller to be handled.
571
406
- Will merge to 'next'.
572
+ Will merge to 'master'.
573
574
575
* rs/xopen-reports-open-failures (2021-08-25) 2 commits
410
- - use xopen() to handle fatal open(2) failures
411
- - xopen: explicitly report creation failures
576
+ (merged to 'next' on 2021-08-30 at a8588775c8)
577
+ + use xopen() to handle fatal open(2) failures
578
+ + xopen: explicitly report creation failures
579
580
Error diagnostics improvement.
581
415
- Will merge to 'next'.
582
+ Will merge to 'master'.
583
584
585
* sg/column-nl (2021-08-26) 1 commit
419
- - column: fix parsing of the '--nl' option
586
+ (merged to 'next' on 2021-08-30 at a3cb0f4745)
587
+ + column: fix parsing of the '--nl' option
588
589
The parser for the "--nl" option of "git column" has been
590
corrected.
591
424
- Will merge to 'next'.
592
+ Will merge to 'master'.
593
594
595
* ab/unbundle-progress (2021-08-27) 5 commits
@@ -431,6 +599,11 @@ Release tarballs are available at:
599
- strvec: add a strvec_pushvec()
600
- bundle API: start writing API documentation
601
602
+ Add progress display to "git bundle unbundle".
603
+
604
+ Expecting a reroll.
605
+ cf. <87tuj7xhqo.fsf@evledraar.gmail.com>
606
+
607
608
* jk/log-warn-on-bogus-encoding (2021-08-27) 2 commits
609
- docs: use "character encoding" to refer to commit-object encoding
@@ -444,92 +617,6 @@ Release tarballs are available at:
617
* rs/show-branch-simplify (2021-08-27) 1 commit
618
- show-branch: simplify rev_is_head()
619
447
---------------------------------------------------
448
-[Stalled]
449
-
450
-* gh/gitweb-branch-sort (2021-06-10) 1 commit
451
- - gitweb: use HEAD as secondary sort key in git_get_heads_list()
452
-
453
- Tie-break branches that point at the same object in the list of
454
- branches on GitWeb to show the one pointed at by HEAD early.
455
-
456
- Waiting for reviews.
457
-
458
-
459
-* es/superproject-aware-submodules (2021-08-19) 5 commits
460
- - fixup! introduce submodule.superprojectGitDir record
461
- - submodule: record superproject gitdir during 'update'
462
- - submodule: record superproject gitdir during absorbgitdirs
463
- - introduce submodule.superprojectGitDir record
464
- - t7400-submodule-basic: modernize inspect() helper
465
-
466
- A configuration variable in a submodule points at the location of
467
- the superproject it is bound to (RFC).
468
-
469
- Looking good.
470
-
471
-
472
-* en/zdiff3 (2021-06-15) 2 commits
473
- - update documentation for new zdiff3 conflictStyle
474
- - xdiff: implement a zealous diff3, or "zdiff3"
475
-
476
- "Zealous diff3" style of merge conflict presentation has been added.
477
-
478
- Expecting a reroll.
479
- cf. <CABPp-BE7-E03+x38EK-=AE5mwwdST+d50hiiud2eY2Nsf3rM5g@mail.gmail.com>
480
-
481
-
482
-* ao/p4-avoid-decoding (2021-04-12) 2 commits
483
- - git-p4: do not decode data from perforce by default
484
- - git-p4: avoid decoding more data from perforce
485
-
486
- "git p4" in Python-2 days used to accept a lot more kinds of data
487
- from Perforce server as uninterrupted byte sequence, but after
488
- switching to Python-3, too many things are expected to be in UTF-8,
489
- which broke traditional use cases.
490
-
491
- Waiting for reviews.
492
-
493
-
494
-* tv/p4-fallback-encoding (2021-04-30) 1 commit
495
- - git-p4: git-p4.fallbackEncoding to specify non UTF-8 charset
496
-
497
- "git p4" learns the fallbackEncoding configuration variable to
498
- safely accept changeset descriptions that aren't written in UTF-8.
499
-
500
- Waiting for reviews.
501
-
502
-
503
-* ab/fsck-unexpected-type (2021-07-12) 21 commits
504
- - fsck: report invalid object type-path combinations
505
- - fsck: report invalid types recorded in objects
506
- - object-store.h: move read_loose_object() below 'struct object_info'
507
- - fsck: don't hard die on invalid object types
508
- - object-file.c: return -2 on "header too long" in unpack_loose_header()
509
- - object-file.c: return -1, not "status" from unpack_loose_header()
510
- - object-file.c: guard against future bugs in loose_object_info()
511
- - object-file.c: stop dying in parse_loose_header()
512
- - object-file.c: split up ternary in parse_loose_header()
513
- - object-file.c: simplify unpack_loose_short_header()
514
- - object-file.c: add missing braces to loose_object_info()
515
- - object-file.c: make parse_loose_header_extended() public
516
- - object-file.c: don't set "typep" when returning non-zero
517
- - cache.h: move object functions to object-store.h
518
- - cat-file tests: test for current --allow-unknown-type behavior
519
- - cat-file tests: add corrupt loose object test
520
- - rev-list tests: test for behavior with invalid object types
521
- - cat-file tests: test that --allow-unknown-type isn't on by default
522
- - cat-file tests: test for missing object with -t and -s
523
- - fsck tests: add test for fsck-ing an unknown type
524
- - fsck tests: refactor one test to use a sub-repo
525
-
526
- "git fsck" has been taught to report mismatch between expected and
527
- actual types of an object better.
528
-
529
- Needs review.
530
-
531
---------------------------------------------------
532
-[Cooking]
620
621
* lh/systemd-timers (2021-08-27) 3 commits
622
- maintenance: add support for systemd timers on Linux
@@ -633,15 +720,6 @@ Release tarballs are available at:
720
Will merge to 'master'.
721
722
636
-* th/userdiff-more-java (2021-08-11) 1 commit
637
- (merged to 'next' on 2021-08-24 at a5617abd3e)
638
- + userdiff: improve java hunk header regex
639
-
640
- The userdiff pattern for "java" language has been updated.
641
-
642
- Will merge to 'master'.
643
-
644
-
723
* zh/cherry-pick-advice (2021-08-23) 1 commit
724
- cherry-pick: use better advice message
725
@@ -649,7 +727,7 @@ Release tarballs are available at:
727
conflicted replay of a commit to be resolved by the end user has
728
been updated.
729
652
- Will merge to 'next'?
730
+ Will merge to 'next'.
731
732
733
* es/config-based-hooks (2021-08-19) 7 commits
@@ -665,12 +743,13 @@ Release tarballs are available at:
743
Revamp the hooks subsystem to allow multiple of them to trigger
744
upon the same event and control via the configuration variables.
745
668
- Will merge to 'next'?
746
+ Expecting a reroll
747
+ but ab/config-based-hooks-base needs to be in a better shape first.
748
cf. <87v93wflm0.fsf@evledraar.gmail.com>
749
+ cf. <87tuj7xhqo.fsf@evledraar.gmail.com>
750
751
672
-* mk/clone-recurse-submodules (2021-08-18) 2 commits
673
- - fixup! clone: set submodule.recurse=true if submodule.stickyRecursiveClone enabled
752
+* mk/clone-recurse-submodules (2021-08-30) 1 commit
753
- clone: set submodule.recurse=true if submodule.stickyRecursiveClone enabled
754
755
After "git clone --recurse-submodules", all submodules are cloned
@@ -679,18 +758,7 @@ Release tarballs are available at:
758
configuration is set to true in a repository created by "clone"
759
with "--recurse-submodules" option.
760
682
- cf. <4103806f-6d88-2756-8853-7e16e56ad425@gmail.com>
683
-
684
-
685
-* bc/t5607-avoid-broken-test-fail-prereqs (2021-08-11) 1 commit
686
- (merged to 'next' on 2021-08-24 at 66c1e510ff)
687
- + t5607: avoid using prerequisites to select algorithm
688
-
689
- The current implementation of GIT_TEST_FAIL_PREREQS is broken in
690
- that checking for the lack of a prerequisite would not work. Avoid
691
- the use of "if ! test_have_prereq X" in a test script.
692
-
693
- Will merge to 'master'.
761
+ Will merge to 'next'.
762
763
764
* jk/commit-edit-fixup-fix (2021-08-15) 1 commit
@@ -703,33 +771,6 @@ Release tarballs are available at:
771
Will merge to 'master'.
772
773
706
-* tl/traverse-non-commits-rename (2021-08-12) 1 commit
707
- (merged to 'next' on 2021-08-24 at 55cc85c20a)
708
- + list-objects.c: rename "traverse_trees_and_blobs" to "traverse_non_commits"
709
-
710
- Meh.
711
-
712
- Will merge to 'master'.
713
-
714
-
715
-* cb/ci-freebsd-update (2021-08-12) 1 commit
716
- (merged to 'next' on 2021-08-24 at 1ecf63af7d)
717
- + ci: update freebsd 12 cirrus job
718
-
719
- Update FreeBSD CI job
720
-
721
- Will merge to 'master'.
722
-
723
-
724
-* cb/builtin-merge-format-string-fix (2021-08-09) 1 commit
725
- (merged to 'next' on 2021-08-24 at 6e94c19f1e)
726
- + builtin/merge: avoid -Wformat-extra-args from ancient Xcode
727
-
728
- Code clean-up.
729
-
730
- Will merge to 'master'.
731
-
732
-
774
* ka/want-ref-in-namespace (2021-08-13) 3 commits
775
- docs: clarify the interaction of transfer.hideRefs and namespaces
776
- upload-pack.c: treat want-ref relative to namespace
@@ -758,6 +799,7 @@ Release tarballs are available at:
799
- sparse-index: silently return when not using cone-mode patterns
800
- t7519: rewrite sparse index test
801
- Merge branch 'ds/add-with-sparse-index' into ds/sparse-index-ignored-files
802
+ (this branch is used by sg/test-split-index-fix.)
803
804
In cone mode, the sparse-index codepath learned to remove ignored
805
files (like build artifacts) outside the sparse cone, allowing the
@@ -765,40 +807,7 @@ Release tarballs are available at:
807
especially useful when the sparse patterns change.
808
809
768
-* jc/userdiff-pattern-hint (2021-08-11) 1 commit
769
- (merged to 'next' on 2021-08-24 at f29f51148f)
770
- + userdiff: comment on the builtin patterns
771
-
772
- Remind developers that the userdiff patterns should be kept simple
773
- and permissive, assuming that the contents they apply are always
774
- syntactically correct.
775
-
776
- Will merge to 'master'.
777
-
778
-
779
-* jk/apply-binary-hunk-parsing-fix (2021-08-10) 1 commit
780
- (merged to 'next' on 2021-08-24 at c786cd1e8b)
781
- + apply: keep buffer/size pair in sync when parsing binary hunks
782
-
783
- "git apply" miscounted the bytes and failed to read to the end of
784
- binary hunks.
785
-
786
- Will merge to 'master'.
787
-
788
-
789
-* jk/range-diff-fixes (2021-08-10) 3 commits
790
- (merged to 'next' on 2021-08-24 at eff05f579e)
791
- + range-diff: use ssize_t for parsed "len" in read_patches()
792
- + range-diff: handle unterminated lines in read_patches()
793
- + range-diff: drop useless "offset" variable from read_patches()
794
-
795
- "git range-diff" code clean-up.
796
-
797
- Will merge to 'master'.
798
-
799
-
800
-* js/advise-when-skipping-cherry-picked (2021-08-10) 2 commits
801
- - SQUASH???
810
+* js/advise-when-skipping-cherry-picked (2021-08-30) 1 commit
811
- sequencer: advise if skipping cherry-picked commit
812
813
"git rebase" by default skips changes that are equivalent to
@@ -807,6 +816,8 @@ Release tarballs are available at:
816
skipped commits, and also teach them how to tell "rebase" to keep
817
duplicated changes.
818
819
+ Will merge to 'next'.
820
+
821
822
* jt/grep-wo-submodule-odb-as-alternate (2021-08-13) 8 commits
823
- t7814: show lack of alternate ODB-adding
@@ -856,51 +867,13 @@ Release tarballs are available at:
867
868
869
* cb/makefile-apple-clang (2021-08-06) 3 commits
859
- - build: catch clang that identifies itself as "$VENDOR clang"
860
- - build: clang version may not be followed by extra words
861
- - build: update detect-compiler for newer Xcode version
870
+ (merged to 'next' on 2021-08-30 at 9fe8f1a9b3)
871
+ + build: catch clang that identifies itself as "$VENDOR clang"
872
+ + build: clang version may not be followed by extra words
873
+ + build: update detect-compiler for newer Xcode version
874
875
Build update.
876
865
- Will merge to 'next'.
866
-
867
-
868
-* en/merge-strategy-docs (2021-08-05) 10 commits
869
- (merged to 'next' on 2021-08-24 at ceb66b1062)
870
- + Update error message and code comment
871
- + merge-strategies.txt: add coverage of the `ort` merge strategy
872
- + git-rebase.txt: correct out-of-date and misleading text about renames
873
- + merge-strategies.txt: fix simple capitalization error
874
- + merge-strategies.txt: avoid giving special preference to patience algorithm
875
- + merge-strategies.txt: do not imply using copy detection is desired
876
- + merge-strategies.txt: update wording for the resolve strategy
877
- + Documentation: edit awkward references to `git merge-recursive`
878
- + directory-rename-detection.txt: small updates due to merge-ort optimizations
879
- + git-rebase.txt: correct antiquated claims about --rebase-merges
880
- (this branch is used by en/ort-becomes-the-default.)
881
-
882
- Documentation updates.
883
-
884
- Will merge to 'master'.
885
-
886
-
887
-* en/ort-becomes-the-default (2021-08-05) 2 commits
888
- (merged to 'next' on 2021-08-24 at 92f4e08d83)
889
- + Update docs for change of default merge backend
890
- + Change default merge backend from recursive to ort
891
- (this branch uses en/merge-strategy-docs.)
892
-
893
- Use `ort` instead of `recursive` as the default merge strategy.
894
-
895
- Will merge to 'master'.
896
-
897
-
898
-* js/log-protocol-version (2021-08-10) 1 commit
899
- (merged to 'next' on 2021-08-24 at aeeaee04fb)
900
- + connect, protocol: log negotiated protocol version
901
-
902
- Debugging aid.
903
-
877
Will merge to 'master'.
878
879
@@ -950,7 +923,7 @@ Release tarballs are available at:
923
Large part of "git submodule add" gets rewritten in C.
924
925
953
-* dt/submodule-diff-fixes (2021-08-11) 3 commits
926
+* dt/submodule-diff-fixes (2021-08-31) 3 commits
927
- diff --submodule=diff: don't print failure message twice
928
- diff --submodule=diff: do not fail on ever-initialied deleted submodules
929
- t4060: remove unused variable
@@ -976,26 +949,7 @@ Release tarballs are available at:
949
950
Use ssh public crypto for object and push-cert signing.
951
979
- Comments?
980
-
981
-
982
-* en/pull-conflicting-options (2021-07-22) 8 commits
983
- (merged to 'next' on 2021-08-24 at e1e5b2c551)
984
- + pull: fix handling of multiple heads
985
- + pull: update docs & code for option compatibility with rebasing
986
- + pull: abort by default when fast-forwarding is not possible
987
- + pull: make --rebase and --no-rebase override pull.ff=only
988
- + pull: since --ff-only overrides, handle it first
989
- + pull: abort if --ff-only is given and fast-forwarding is impossible
990
- + t7601: add tests of interactions with multiple merge heads and config
991
- + t7601: test interaction of merge/rebase/fast-forward flags and options
992
-
993
- "git pull" had various corner cases that were not well thought out
994
- around its --rebase backend, e.g. "git pull --ff-only" did not stop
995
- but went ahead and rebased when the history on other side is not a
996
- descendant of our history. The series tries to fix them up.
997
-
998
- Will merge to 'master'.
952
+ Will merge to 'next'.
953
954
955
* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
@@ -1017,8 +971,7 @@ Release tarballs are available at:
971
972
Build clean-up for "make tags" and friends.
973
1020
- Expecting a reroll.
1021
- 4/5 may want a minor tweak to the log and the patch text but otherwise looks good.
974
+ Will merge to 'next'?
975
976
977
* tb/multi-pack-bitmaps (2021-08-24) 25 commits
@@ -1115,7 +1068,7 @@ Release tarballs are available at:
1068
1069
Code clean-up around "git serve".
1070
1118
- Expecting a reroll.
1071
+ Will merge to 'next'?
1072
1073
1074
* ab/test-tool-cache-cleanup (2021-08-24) 4 commits
@@ -1126,6 +1079,9 @@ Release tarballs are available at:
1079
1080
Test code shuffling.
1081
1082
+ Will discard.
1083
+ cf. <87tuj7xhqo.fsf@evledraar.gmail.com>
1084
+
1085
1086
* ab/pack-objects-stdin (2021-07-09) 5 commits
1087
- pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS