What's cooking (2021/07 #06)

Junio C Hamano committed Jul 26, 2021 at 17:50 UTC a20ce86daaabe020c44e4ff8460421d07c61a60a
1 file changed +347 -171
whats-cooking.txt
+347 -171
@@ -1,9 +1,9 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Jul 2021, #05; Wed, 21)
3 -X-master-at: daab8a564f8bbac55f70f8bf86c070e001a9b006
4 -X-next-at: 7e0b7c1f0c169fbf424a182c53f9a5a516fe85f4
2 +Subject: What's cooking in git.git (Jul 2021, #06; Mon, 26)
3 +X-master-at: eb27b338a3e71c7c4079fbac8aeae3f8fbb5c687
4 +X-next-at: 689316a459d26cd93a42ae056635db0b760bb0e9
5
6 -What's cooking in git.git (Jul 2021, #05; Wed, 21)
6 +What's cooking in git.git (Jul 2021, #06; Mon, 26)
7 --------------------------------------------------
8
9 Here are the topics that have been cooking in my tree. Commits
@@ -45,18 +45,296 @@ Release tarballs are available at:
45
46 https://www.kernel.org/pub/software/scm/git/
47
48 +--------------------------------------------------
49 +[Graduated to 'master']
50 +
51 +* ab/gitignore-discovery-doc (2021-07-06) 1 commit
52 + (merged to 'next' on 2021-07-13 at 02f3b3deab)
53 + + docs: .gitignore parsing is to the top of the repo
54 +
55 + Doc update.
56 +
57 +
58 +* ab/imap-send-read-everything-simplify (2021-07-07) 1 commit
59 + (merged to 'next' on 2021-07-13 at ab59128bfb)
60 + + imap-send.c: use less verbose strbuf_fread() idiom
61 +
62 + Code simplification.
63 +
64 +
65 +* ab/send-email-optim (2021-05-28) 13 commits
66 + (merged to 'next' on 2021-07-08 at 35ac315894)
67 + + perl: nano-optimize by replacing Cwd::cwd() with Cwd::getcwd()
68 + + send-email: move trivial config handling to Perl
69 + + perl: lazily load some common Git.pm setup code
70 + + send-email: lazily load modules for a big speedup
71 + + send-email: get rid of indirect object syntax
72 + + send-email: use function syntax instead of barewords
73 + + send-email: lazily shell out to "git var"
74 + + send-email: lazily load config for a big speedup
75 + + send-email: copy "config_regxp" into git-send-email.perl
76 + + send-email: refactor sendemail.smtpencryption config parsing
77 + + send-email: remove non-working support for "sendemail.smtpssl"
78 + + send-email tests: test for boolean variables without a value
79 + + send-email tests: support GIT_TEST_PERL_FATAL_WARNINGS=true
80 +
81 + "git send-email" optimization.
82 +
83 +
84 +* bc/rev-list-without-commit-line (2021-07-12) 1 commit
85 + (merged to 'next' on 2021-07-13 at 1ceed60061)
86 + + rev-list: add option for --pretty=format without header
87 +
88 + "git rev-list" learns to omit the "commit <object-name>" header
89 + lines from the output with the `--no-commit-header` option.
90 +
91 +
92 +* jk/typofix (2021-07-13) 1 commit
93 + (merged to 'next' on 2021-07-13 at cce3caa34e)
94 + + doc/rev-list-options: fix duplicate word typo
95 +
96 + Typofix.
97 +
98 +
99 +* js/ci-windows-update (2021-07-06) 7 commits
100 + (merged to 'next' on 2021-07-13 at 329771e960)
101 + + ci: accelerate the checkout
102 + + ci (vs-build): build with NO_GETTEXT
103 + + artifacts-tar: respect NO_GETTEXT
104 + + ci (windows): transfer also the Git-tracked files to the test jobs
105 + + ci: upgrade to using actions/{up,down}load-artifacts v2
106 + + ci (vs-build): use `cmd` to copy the DLLs, not `powershell`
107 + + ci: use the new GitHub Action to download git-sdk-64-minimal
108 +
109 + GitHub Actions / CI update.
110 +
111 --------------------------------------------------
112 [New Topics]
113
51 -* ab/bundle-tests (2021-07-20) 2 commits
52 - - bundle tests: use test_cmp instead of grep
53 - - bundle tests: use ">file" not ": >file"
114 +* ab/http-drop-old-curl (2021-07-21) 5 commits
115 + - http: rename CURLOPT_FILE to CURLOPT_WRITEDATA
116 + - http: drop support for curl < 7.19.3 and < 7.16.4 (again)
117 + - http: drop support for curl < 7.19.4
118 + - http: drop support for curl < 7.16.0
119 + - http: drop support for curl < 7.11.1
120 +
121 + Support for ancient versions of cURL library has been dropped.
122 +
123 + Expecting a hopefully final reroll to correct log messages.
124 +
125 +
126 +* ab/lib-subtest (2021-07-21) 10 commits
127 + - test-lib tests: assert 1 exit code, not non-zero
128 + - test-lib tests: refactor common part of check_sub_test_lib_test*()
129 + - test-lib tests: avoid subshell for "test_cmp" for readability
130 + - test-lib tests: get rid of copy/pasted mock test code
131 + - test-lib tests: don't provide a description for the sub-tests
132 + - test-lib tests: stop using a subshell in write_sub_test_lib_test()
133 + - test-lib tests: split up "write and run" into two functions
134 + - test-lib tests: move "run_sub_test" to a new lib-subtest.sh
135 + - Merge branch 'ps/t0000-output-directory-fix' into ab/lib-subtest
136 + - Merge branch 'jk/t0000-subtests-fix' into ab/lib-subtest
137 + (this branch uses jk/t0000-subtests-fix and ps/t0000-output-directory-fix.)
138 +
139 + Updates to the tests in t0000 to test th etest framework.
140
55 - "git bundle" gained more test coverage.
141 +
142 +* ds/add-with-sparse-index (2021-07-26) 5 commits
143 + - add: remove ensure_full_index() with --renormalize
144 + - add: ignore outside the sparse-checkout in refresh()
145 + - pathspec: stop calling ensure_full_index
146 + - add: allow operating on a sparse-only index
147 + - t1092: test merge conflicts outside cone
148 + (this branch uses ds/commit-and-checkout-with-sparse-index and ds/status-with-sparse-index.)
149 +
150 + "git add" can work better with the sparse index.
151 +
152 +
153 +* fc/pull-no-rebase-merges-theirs-into-ours (2021-07-21) 1 commit
154 + - doc: pull: fix rebase=false documentation
155 +
156 + Documentation fix for "git pull --rebase=no".
157 +
158 + Will merge to 'next'.
159 +
160 +
161 +* ab/only-single-progress-at-once (2021-07-23) 8 commits
162 + - progress.c: add & assert a "global_progress" variable
163 + - pack-bitmap-write.c: add a missing stop_progress()
164 + - progress.c: add temporary variable from progress struct
165 + - progress.c: stop eagerly fflush(stderr) when not a terminal
166 + - progress.c: call progress_interval() from progress_test_force_update()
167 + - progress.c: move signal handler functions lower
168 + - progress.c tests: test some invalid usage
169 + - progress.c tests: make start/stop verbs on stdin
170 +
171 + Further tweaks on progress API.
172 +
173 +
174 +* ab/progress-users-adjust-counters (2021-07-23) 3 commits
175 + - entry: show finer-grained counter in "Filtering content" progress line
176 + - midx: don't provide a total for QSORT() progress
177 + - commit-graph: fix bogus counter in "Scanning merged commits" progress line
178 +
179 + The code to show progress indicator in a few codepaths did not
180 + cover between 0-100%, which has been corrected.
181 +
182 + Will merge to 'next'.
183 +
184 +
185 +* ar/submodule-add-config (2021-07-26) 1 commit
186 + - submodule--helper: introduce add-config subcommand
187 + (this branch uses ar/submodule-add.)
188 +
189 + Large part of "git submodule add" gets rewritten in C.
190 +
191 +
192 +* en/ort-perf-batch-15 (2021-07-23) 7 commits
193 + - merge-ort: reuse path strings in pool_alloc_filespec
194 + - merge-ort: store filepairs and filespecs in our mem_pool
195 + - diffcore-rename, merge-ort: add wrapper functions for filepair alloc/dealloc
196 + - merge-ort: switch our strmaps over to using memory pools
197 + - merge-ort: add pool_alloc, pool_calloc, and pool_strndup wrappers
198 + - merge-ort: set up a memory pool
199 + - diffcore-rename: use a mem_pool for exact rename detection's hashmap
200 + (this branch uses en/ort-perf-batch-14.)
201 +
202 + Final batch for "merge -sort" optimization.
203 +
204 +
205 +* hn/refs-test-cleanup-contd (2021-07-22) 6 commits
206 + - t6001: avoid direct file system access
207 + - t6500: use "ls -1" to snapshot ref database state
208 + - t7064: use update-ref -d to remove upstream branch
209 + - t1410: mark test as REFFILES
210 + - t1405: mark test for 'git pack-refs' as REFFILES
211 + - t1405: use 'git reflog exists' to check reflog existence
212 + (this branch uses hn/refs-test-cleanup.)
213 +
214 + More test clean-up around refs
215 +
216 + Probably I should combine this into the base topic and have them
217 + graduate together.
218 +
219 +
220 +* jk/check-pack-valid-before-opening-bitmap (2021-07-23) 1 commit
221 + - pack-bitmap: check pack validity when opening bitmap
222 +
223 + A race between repacking and using pack bitmaps has been corrected.
224 +
225 + Will merge to 'next'.
226 +
227 +
228 +* jt/bulk-prefetch (2021-07-23) 2 commits
229 + - cache-tree: prefetch in partial clone read-tree
230 + - unpack-trees: refactor prefetching code
231 +
232 + "git read-tree" had a codepath where blobs are fetched one-by-one
233 + from the promisor remote, which has been corrected to fetch in bulk.
234 +
235 + Will merge to 'next'.
236 +
237 +
238 +* pb/merge-autostash-more (2021-07-23) 4 commits
239 + - merge: apply autostash if merge strategy fails
240 + - merge: apply autostash if fast-forward fails
241 + - Documentation: define 'MERGE_AUTOSTASH'
242 + - merge: add missing word "strategy" to a message
243 +
244 + The local changes stashed by "git merge --autostash" were lost when
245 + the merge failed in certain ways, which has been corrected.
246 +
247 + Will merge to 'next'.
248 +
249 +
250 +* ah/plugleaks (2021-07-26) 12 commits
251 + - reset: clear_unpack_trees_porcelain to plug leak
252 + - builtin/rebase: fix options.strategy memory lifecycle
253 + - builtin/merge: free found_ref when done
254 + - builtin/mv: free or UNLEAK multiple pointers at end of cmd_mv
255 + - convert: release strbuf to avoid leak
256 + - read-cache: call diff_setup_done to avoid leak
257 + - ref-filter: also free head for ATOM_HEAD to avoid leak
258 + - diffcore-rename: move old_dir/new_dir definition to plug leak
259 + - builtin/for-each-repo: remove unnecessary argv copy to plug leak
260 + - builtin/submodule--helper: release unused strbuf to avoid leak
261 + - environment: move strbuf into block to plug leak
262 + - fmt-merge-msg: free newly allocated temporary strings when done
263 +
264 + Leak plugging.
265
266 Will merge to 'next'.
267
268
269 +* js/expand-runtime-prefix (2021-07-26) 6 commits
270 + - expand_user_path: allow in-flight topics to keep using the old name
271 + - interpolate_path(): allow specifying paths relative to the runtime prefix
272 + - Use a better name for the function interpolating paths
273 + - expand_user_path(): clarify the role of the `real_home` parameter
274 + - expand_user_path(): remove stale part of the comment
275 + - tests: exercise the RUNTIME_PREFIX feature
276 +
277 + Pathname expansion (like "~username/") learned a way to specify a
278 + location relative to Git installation (e.g. its $sharedir which is
279 + $(prefix)/share), with "%(prefix)".
280 +
281 +
282 +* zh/cherry-pick-help-is-only-for-sequencer (2021-07-26) 1 commit
283 + - cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP
284 +
285 + "git cherry-pick" loses its state file when a stray
286 + GIT_CHERRY_PICK_HELP environment is present, which has been
287 + corrected.
288 +
289 +
290 +* dt/submodule-diff-fixes (2021-07-26) 3 commits
291 + - diff --submodule=diff: do not print failure message twice
292 + - diff --submodule=diff: do not fail on ever-initialied deleted submodules
293 + - t4060: remove unused variable
294 +
295 + "git diff --submodule=diff" showed failure from run_command() when
296 + trying to run diff inside a submodule, when the user manually
297 + removes the submodule directory.
298 +
299 + It is clear that a problem exists, but it is unclear if the
300 + proposed solution is a desirable one.
301 +
302 +--------------------------------------------------
303 +[Stalled]
304 +
305 +* ao/p4-avoid-decoding (2021-04-12) 2 commits
306 + - git-p4: do not decode data from perforce by default
307 + - git-p4: avoid decoding more data from perforce
308 +
309 + "git p4" in Python-2 days used to accept a lot more kinds of data
310 + from Perforce server as uninterrupted byte sequence, but after
311 + switching to Python-3, too many things are expected to be in UTF-8,
312 + which broke traditional use cases.
313 +
314 + Waiting for reviews.
315 +
316 +
317 +* tv/p4-fallback-encoding (2021-04-30) 1 commit
318 + - git-p4: git-p4.fallbackEncoding to specify non UTF-8 charset
319 +
320 + "git p4" learns the fallbackEncoding configuration variable to
321 + safely accept changeset descriptions that aren't written in UTF-8.
322 +
323 + Waiting for reviews.
324 +
325 +--------------------------------------------------
326 +[Cooking]
327 +
328 +* ab/bundle-tests (2021-07-22) 2 commits
329 + (merged to 'next' on 2021-07-22 at 053b5d0ecf)
330 + + bundle tests: use test_cmp instead of grep
331 + + bundle tests: use ">file" not ": >file"
332 +
333 + "git bundle" gained more test coverage.
334 +
335 + Will merge to 'master'.
336 +
337 +
338 * es/config-based-hooks (2021-07-20) 9 commits
339 - hook: implement hookcmd.<name>.skip
340 - hook: teach 'hookcmd' config to alias hook scripts
@@ -99,17 +377,18 @@ Release tarballs are available at:
377
378
379 * pb/submodule-recurse-doc (2021-07-20) 1 commit
102 - - doc: clarify description of 'submodule.recurse'
380 + (merged to 'next' on 2021-07-22 at 4129e89833)
381 + + doc: clarify description of 'submodule.recurse'
382
383 Doc update.
384
106 - Will merge to 'next'.
385 + Will merge to 'master'.
386
387
388 * ps/t0000-output-directory-fix (2021-07-20) 1 commit
389 (merged to 'next' on 2021-07-20 at 7e0b7c1f0c)
390 + t0000: fix test if run with TEST_OUTPUT_DIRECTORY
112 - (this branch uses jk/t0000-subtests-fix.)
391 + (this branch is used by ab/lib-subtest; uses jk/t0000-subtests-fix.)
392
393 "TEST_OUTPUT_DIRECTORY=there make test" failed to work, which has
394 been corrected.
@@ -118,11 +397,12 @@ Release tarballs are available at:
397
398
399 * tb/bitmap-type-filter-comment-fix (2021-07-20) 1 commit
121 - - pack-bitmap: clarify comment in filter_bitmap_exclude_type()
400 + (merged to 'next' on 2021-07-22 at 8428556149)
401 + + pack-bitmap: clarify comment in filter_bitmap_exclude_type()
402
403 In-code comment update.
404
125 - Will merge to 'next'.
405 + Will merge to 'master'.
406
407
408 * tb/reverse-midx (2021-07-19) 1 commit
@@ -137,42 +417,19 @@ Release tarballs are available at:
417
418
419 * hn/refs-test-cleanup (2021-07-19) 5 commits
140 - - t2402: use ref-store test helper to create broken symlink
141 - - t3320: use git-symbolic-ref rather than filesystem access
142 - - t6120: use git-update-ref rather than filesystem access
143 - - t1503: mark symlink test as REFFILES
144 - - t6050: use git-update-ref rather than filesystem access
420 + (merged to 'next' on 2021-07-22 at 2ab8bc259a)
421 + + t2402: use ref-store test helper to create broken symlink
422 + + t3320: use git-symbolic-ref rather than filesystem access
423 + + t6120: use git-update-ref rather than filesystem access
424 + + t1503: mark symlink test as REFFILES
425 + + t6050: use git-update-ref rather than filesystem access
426 + (this branch is used by hn/refs-test-cleanup-contd.)
427
428 A handful of tests that assumed implementation details of files
429 backend for refs have been cleaned up.
430
149 - Will merge to 'next'.
150 -
151 ---------------------------------------------------
152 -[Stalled]
153 -
154 -* ao/p4-avoid-decoding (2021-04-12) 2 commits
155 - - git-p4: do not decode data from perforce by default
156 - - git-p4: avoid decoding more data from perforce
157 -
158 - "git p4" in Python-2 days used to accept a lot more kinds of data
159 - from Perforce server as uninterrupted byte sequence, but after
160 - switching to Python-3, too many things are expected to be in UTF-8,
161 - which broke traditional use cases.
162 -
163 - Waiting for reviews.
164 -
165 -
166 -* tv/p4-fallback-encoding (2021-04-30) 1 commit
167 - - git-p4: git-p4.fallbackEncoding to specify non UTF-8 charset
168 -
169 - "git p4" learns the fallbackEncoding configuration variable to
170 - safely accept changeset descriptions that aren't written in UTF-8.
171 -
172 - Waiting for reviews.
431 + Will merge to 'master'.
432
174 ---------------------------------------------------
175 -[Cooking]
433
434 * hn/reftable (2021-07-20) 26 commits
435 - t7004: avoid direct filesystem access
@@ -206,25 +463,30 @@ Release tarballs are available at:
463
464
465 * jk/config-env-doc (2021-07-20) 3 commits
209 - - doc/git-config: simplify "override" advice for FILES section
210 - - doc/git-config: clarify GIT_CONFIG environment variable
211 - - doc/git-config: explain --file instead of referring to GIT_CONFIG
466 + (merged to 'next' on 2021-07-22 at 45616c831e)
467 + + doc/git-config: simplify "override" advice for FILES section
468 + + doc/git-config: clarify GIT_CONFIG environment variable
469 + + doc/git-config: explain --file instead of referring to GIT_CONFIG
470
471 Documentation around GIT_CONFIG has been updated.
472
215 - Will merge to 'next'.
473 + Will merge to 'master'.
474
475
476 * js/ci-check-whitespace-updates (2021-07-14) 2 commits
219 - - ci(check-whitespace): restrict to the intended commits
220 - - ci(check-whitespace): stop requiring a read/write token
477 + (merged to 'next' on 2021-07-22 at cdc9aa0622)
478 + + ci(check-whitespace): restrict to the intended commits
479 + + ci(check-whitespace): stop requiring a read/write token
480
481 CI update.
482
224 - Will merge to 'next'.
483 + Will merge to 'master'.
484
485
227 -* js/ci-make-sparse (2021-07-14) 1 commit
486 +* js/ci-make-sparse (2021-07-26) 3 commits
487 + (merged to 'next' on 2021-07-26 at 689316a459)
488 + + ci/install-dependencies: handle "sparse" job package installs
489 + + ci: run "apt-get update" before "apt-get install"
490 (merged to 'next' on 2021-07-20 at 99f518bdef)
491 + ci: run `make sparse` as part of the GitHub workflow
492
@@ -243,14 +505,13 @@ Release tarballs are available at:
505 Will merge to 'master'.
506
507
246 -* ab/refs-files-cleanup (2021-07-20) 12 commits
508 +* ab/refs-files-cleanup (2021-07-26) 11 commits
509 - refs/files: remove unused "errno != ENOTDIR" condition
510 - refs/files: remove unused "errno == EISDIR" code
511 - refs/files: remove unused "oid" in lock_ref_oid_basic()
512 - reflog expire: don't lock reflogs using previously seen OID
513 - refs/files: add a comment about refs_reflog_exists() call
514 - refs: make repo_dwim_log() accept a NULL oid
253 - - refs API: pass the "lock OID" to reflog "prepare"
515 - refs/debug: re-indent argument list for "prepare"
516 - refs/files: remove unused "skip" in lock_raw_ref() too
517 - refs/files: remove unused "extras/skip" in lock_ref_oid_basic()
@@ -263,7 +524,7 @@ Release tarballs are available at:
524 Will merge to 'next'.
525
526
266 -* en/pull-conflicting-options (2021-07-20) 8 commits
527 +* en/pull-conflicting-options (2021-07-22) 8 commits
528 - pull: fix handling of multiple heads
529 - pull: update docs & code for option compatibility with rebasing
530 - pull: abort by default when fast-forwarding is not possible
@@ -282,7 +543,7 @@ Release tarballs are available at:
543 * jk/t0000-subtests-fix (2021-07-19) 1 commit
544 (merged to 'next' on 2021-07-20 at 81412e1684)
545 + t0000: clear GIT_SKIP_TESTS before running sub-tests
285 - (this branch is used by ps/t0000-output-directory-fix.)
546 + (this branch is used by ab/lib-subtest and ps/t0000-output-directory-fix.)
547
548 Test fix.
549
@@ -345,43 +606,6 @@ Release tarballs are available at:
606 Will merge to 'master'.
607
608
348 -* jk/typofix (2021-07-13) 1 commit
349 - (merged to 'next' on 2021-07-13 at cce3caa34e)
350 - + doc/rev-list-options: fix duplicate word typo
351 -
352 - Typofix.
353 -
354 - Will merge to 'master'.
355 -
356 -
357 -* ab/gitignore-discovery-doc (2021-07-06) 1 commit
358 - (merged to 'next' on 2021-07-13 at 02f3b3deab)
359 - + docs: .gitignore parsing is to the top of the repo
360 -
361 - Doc update.
362 -
363 - Will merge to 'master'.
364 -
365 -
366 -* bc/rev-list-without-commit-line (2021-07-12) 1 commit
367 - (merged to 'next' on 2021-07-13 at 1ceed60061)
368 - + rev-list: add option for --pretty=format without header
369 -
370 - "git rev-list" learns to omit the "commit <object-name>" header
371 - lines from the output with the `--no-commit-header` option.
372 -
373 - Will merge to 'master'.
374 -
375 -
376 -* ab/imap-send-read-everything-simplify (2021-07-07) 1 commit
377 - (merged to 'next' on 2021-07-13 at ab59128bfb)
378 - + imap-send.c: use less verbose strbuf_fread() idiom
379 -
380 - Code simplification.
381 -
382 - Will merge to 'master'.
383 -
384 -
609 * ab/pkt-line-tests (2021-07-19) 1 commit
610 (merged to 'next' on 2021-07-20 at 8e5e53450c)
611 + test-lib-functions: use test-tool for [de]packetize()
@@ -410,6 +634,7 @@ Release tarballs are available at:
634 - merge-ort: add data structures for allowable trivial directory resolves
635 - merge-ort: add some more explanations in collect_merge_info_callback()
636 - merge-ort: resolve paths early when we have sufficient information
637 + (this branch is used by en/ort-perf-batch-15.)
638
639 Further optimization on "merge -sort" backend.
640
@@ -427,11 +652,12 @@ Release tarballs are available at:
652
653
654 * ps/perf-with-separate-output-directory (2021-07-02) 1 commit
430 - - perf: fix when running with TEST_OUTPUT_DIRECTORY
655 + (merged to 'next' on 2021-07-22 at af51ca0a39)
656 + + perf: fix when running with TEST_OUTPUT_DIRECTORY
657
658 Test update.
659
434 - Will merge to 'next'.
660 + Will merge to 'master'.
661
662
663 * sm/worktree-add-lock (2021-07-15) 3 commits
@@ -476,7 +702,7 @@ Release tarballs are available at:
702 - commit: integrate with sparse-index
703 - p2000: compress repo names
704 - p2000: add 'git checkout -' test and decrease depth
479 - (this branch uses ds/status-with-sparse-index.)
705 + (this branch is used by ds/add-with-sparse-index; uses ds/status-with-sparse-index.)
706
707 "git checkout" and "git commit" learn to work without unnecessarily
708 expanding sparse indexes.
@@ -514,21 +740,6 @@ Release tarballs are available at:
740 Will merge to 'master'.
741
742
517 -* js/ci-windows-update (2021-07-06) 7 commits
518 - (merged to 'next' on 2021-07-13 at 329771e960)
519 - + ci: accelerate the checkout
520 - + ci (vs-build): build with NO_GETTEXT
521 - + artifacts-tar: respect NO_GETTEXT
522 - + ci (windows): transfer also the Git-tracked files to the test jobs
523 - + ci: upgrade to using actions/{up,down}load-artifacts v2
524 - + ci (vs-build): use `cmd` to copy the DLLs, not `powershell`
525 - + ci: use the new GitHub Action to download git-sdk-64-minimal
526 -
527 - GitHub Actions / CI update.
528 -
529 - Will merge to 'master'.
530 -
531 -
743 * jt/push-negotiation-fixes (2021-07-15) 3 commits
744 - fetch: die on invalid --negotiation-tip hash
745 - send-pack: fix push nego. when remote has refs
@@ -540,19 +751,17 @@ Release tarballs are available at:
751 Needs review.
752
753
543 -* ab/make-tags-cleanup (2021-06-29) 5 commits
754 +* ab/make-tags-cleanup (2021-07-22) 5 commits
755 - Makefile: normalize clobbering & xargs for tags targets
756 + - Makefile: the "cscope" target always creates a "cscope.out"
757 - Makefile: don't use "FORCE" for tags targets
546 - - Makefile: fix "cscope" target to refer to cscope.out
758 - Makefile: add QUIET_GEN to "cscope" target
759 - Makefile: move ".PHONY: cscope" near its target
760
761 Build clean-up for "make tags" and friends.
762
552 - Expecting a reroll.
553 - Hopefully with a final reroll it would become good enough shape for 'next'?
554 - cf. <YN5AwdVC3QAcy2tA@coredump.intra.peff.net>
555 - cf. <67c45b13-df8f-8065-377a-fbd2f80992ee@ramsayjones.plus.com>
763 + Will merge to 'next'?
764 + 4/5 may want a minor tweak to the log and the patch text but otherwise looks good.
765
766
767 * tb/multi-pack-bitmaps (2021-06-28) 24 commits
@@ -606,7 +815,7 @@ Release tarballs are available at:
815 + t1092: replace incorrect 'echo' with 'cat'
816 + sparse-index: include EXTENDED flag when expanding
817 + sparse-index: skip indexes with unmerged entries
609 - (this branch is used by ds/commit-and-checkout-with-sparse-index.)
818 + (this branch is used by ds/add-with-sparse-index and ds/commit-and-checkout-with-sparse-index.)
819
820 "git status" codepath learned to work with sparsely populated index
821 without hydrating it fully.
@@ -732,7 +941,7 @@ Release tarballs are available at:
941 --color-moved" feature.
942
943
735 -* hn/refs-errno-cleanup (2021-07-20) 7 commits
944 +* hn/refs-errno-cleanup (2021-07-26) 7 commits
945 - refs: make errno output explicit for refs_resolve_ref_unsafe
946 - refs: explicitly return failure_errno from parse_loose_ref_contents
947 - refs: add failure_errno to refs_read_raw_ref() signature
@@ -769,15 +978,18 @@ Release tarballs are available at:
978 Introduce handle_stdin_line callback to revision API and uses it.
979
980
772 -* ar/submodule-add (2021-07-12) 4 commits
773 - - submodule--helper: introduce add-clone subcommand
774 - - submodule--helper: refactor module_clone()
775 - - submodule: prefix die messages with 'fatal'
776 - - t7400: test failure to add submodule in tracked path
981 +* ar/submodule-add (2021-07-26) 5 commits
982 + - submodule: drop unused sm_name parameter from show_fetch_remotes()
983 + (merged to 'next' on 2021-07-22 at b8b636c9a1)
984 + + submodule--helper: introduce add-clone subcommand
985 + + submodule--helper: refactor module_clone()
986 + + submodule: prefix die messages with 'fatal'
987 + + t7400: test failure to add submodule in tracked path
988 + (this branch is used by ar/submodule-add-config.)
989
990 Rewrite of "git submodule" in C continues.
991
780 - Will merge to 'next'.
992 + Will merge to 'master'.
993
994
995 * ds/gender-neutral-doc-guidelines (2021-07-16) 1 commit
@@ -821,34 +1033,19 @@ Release tarballs are available at:
1033 cf. <60be6f7fa4435_db80d208f2@natae.notmuch>
1034
1035
824 -* ab/update-submitting-patches (2021-06-08) 3 commits
825 - - SubmittingPatches: remove pine-specific hints from MUA hints
1036 +* ab/update-submitting-patches (2021-07-22) 2 commits
1037 - SubmittingPatches: replace discussion of Travis with GitHub Actions
1038 - SubmittingPatches: move discussion of Signed-off-by above "send"
1039
1040 Reorganize and update the SubmitingPatches document.
1041
831 - Expecting a reroll.
832 - cf. <20210607172542.GA6312@szeder.dev>
833 - cf. <nycvar.QRO.7.76.6.2106072346560.55@tvgsbejvaqbjf.bet>
834 -
835 -
836 -* zh/ref-filter-raw-data (2021-07-15) 18 commits
837 - - cat-file: use fast path when using default_format
838 - - ref-filter: remove grab_oid() function
839 - - cat-file: re-implement --textconv, --filters options
840 - - cat-file: reuse err buf in batch_object_write()
841 - - cat-file: reuse ref-filter logic
842 - - cat-file: create p1006-cat-file.sh
843 - - cat-file: change batch_objects parameter name
844 - - cat-file: add has_object_file() check
845 - - ref-filter: modify the error message and value in get_object
846 - - ref-filter: add cat_file_mode to ref_format
847 - - ref-filter: introduce free_ref_array_item_value() function
848 - - ref-filter: pass get_object() return value to their callers
1042 + Will merge to 'next'.
1043 +
1044 +
1045 +* zh/ref-filter-raw-data (2021-07-26) 6 commits
1046 - ref-filter: add %(rest) atom
1047 - ref-filter: use non-const ref_format in *_atom_parser()
851 - - ref-filter: --format=%(raw) re-support --perl
1048 + - ref-filter: --format=%(raw) support --perl
1049 - ref-filter: add %(raw) atom
1050 - ref-filter: add obj-type check in grab contents
1051 - Merge branch 'zh/cat-file-batch-fix' into zh/ref-filter-raw-data
@@ -857,7 +1054,7 @@ Release tarballs are available at:
1054 option of "git for-each-ref" and its friends to be used in "git
1055 cat-file --batch".
1056
860 - Heavy performance degradation has been observed with this series.
1057 + Will merge to 'next'.
1058
1059
1060 * jh/builtin-fsmonitor (2021-07-12) 35 commits
@@ -903,35 +1100,14 @@ Release tarballs are available at:
1100 So, where are we with this topic?
1101
1102
906 -* es/trace2-log-parent-process-name (2021-06-09) 1 commit
1103 +* es/trace2-log-parent-process-name (2021-07-22) 2 commits
1104 - tr2: log parent process name
1105 + - tr2: make process info collection platform-generic
1106
1107 trace2 logs learned to show parent process name to see in what
1108 context Git was invoked.
1109
912 - Expecting a reroll.
913 - cf. <YNux62he9Mk43Y1B@google.com>
914 -
915 -
916 -* ab/send-email-optim (2021-05-28) 13 commits
917 - (merged to 'next' on 2021-07-08 at 35ac315894)
918 - + perl: nano-optimize by replacing Cwd::cwd() with Cwd::getcwd()
919 - + send-email: move trivial config handling to Perl
920 - + perl: lazily load some common Git.pm setup code
921 - + send-email: lazily load modules for a big speedup
922 - + send-email: get rid of indirect object syntax
923 - + send-email: use function syntax instead of barewords
924 - + send-email: lazily shell out to "git var"
925 - + send-email: lazily load config for a big speedup
926 - + send-email: copy "config_regxp" into git-send-email.perl
927 - + send-email: refactor sendemail.smtpencryption config parsing
928 - + send-email: remove non-working support for "sendemail.smtpssl"
929 - + send-email tests: test for boolean variables without a value
930 - + send-email tests: support GIT_TEST_PERL_FATAL_WARNINGS=true
931 -
932 - "git send-email" optimization.
933 -
934 - Will merge to 'master'.
1110 + Looking good. Ready for 'next'?
1111
1112
1113 * ab/fsck-unexpected-type (2021-07-12) 21 commits