What's cooking (2021/09 #08)

This commit is contained in:
Junio C Hamano
2021-09-27 14:42:02 -07:00
parent 687d33056e
commit 723ddc763f

View File

@@ -1,10 +1,10 @@
To: git@vger.kernel.org
Bcc: lwn@lwn.net
Subject: What's cooking in git.git (Sep 2021, #07; Thu, 23)
Subject: What's cooking in git.git (Sep 2021, #08; Mon, 27)
X-master-at: ddb1055343948e0d0bc81f8d20245f1ada6430a0
X-next-at: 4c38ced6901a8523cea197b31b2616240ec9fb6e
What's cooking in git.git (Sep 2021, #07; Thu, 23)
What's cooking in git.git (Sep 2021, #08; Mon, 27)
--------------------------------------------------
Here are the topics that have been cooking in my tree. Commits
@@ -18,7 +18,7 @@ useful"). Do not read too much into a topic being in (or not in)
'seen'. The ones marked with '.' do not appear in any of the
integration branches, but I am still holding onto them.
The eighth batch is out.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
@@ -49,340 +49,84 @@ Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
[New Topics]
* ab/gc-remove-unused-call (2021-09-12) 1 commit
(merged to 'next' on 2021-09-13 at 14f69ed198)
+ gc: remove unused launchctl_get_uid() call
* ab/bundle-remove-verbose-option (2021-09-23) 1 commit
- bundle: remove ignored & undocumented "--verbose" flag
Code clean-up.
Doc update.
Will merge to 'next'.
* ab/http-drop-old-curl-plus (2021-09-13) 9 commits
(merged to 'next' on 2021-09-15 at 16aaab36f1)
+ http: don't hardcode the value of CURL_SOCKOPT_OK
+ http: centralize the accounting of libcurl dependencies
+ http: correct curl version check for CURLOPT_PINNEDPUBLICKEY
+ http: correct version check for CURL_HTTP_VERSION_2
+ http: drop support for curl < 7.18.0 (again)
+ Makefile: drop support for curl < 7.9.8 (again)
+ INSTALL: mention that we need libcurl 7.19.4 or newer to build
+ INSTALL: reword and copy-edit the "libcurl" section
+ INSTALL: don't mention the "curl" executable at all
Conditional compilation around versions of libcURL has been
straightened out.
* ab/config-based-hooks-1 (2021-09-27) 8 commits
- hook-list.h: add a generated list of hooks, like config-list.h
- hook.c users: use "hook_exists()" instead of "find_hook()"
- hook.c: add a hook_exists() wrapper and use it in bugreport.c
- hook.[ch]: move find_hook() from run-command.c to hook.c
- Makefile: remove an out-of-date comment
- Makefile: don't perform "mv $@+ $@" dance for $(GENERATED_H)
- Makefile: stop hardcoding {command,config}-list.h
- Makefile: mark "check" target as .PHONY
* ab/retire-option-argument (2021-09-12) 4 commits
(merged to 'next' on 2021-09-15 at 0bd7ce1161)
+ parse-options API: remove OPTION_ARGUMENT feature
+ difftool: use run_command() API in run_file_diff()
+ difftool: prepare "diff" cmdline in cmd_difftool()
+ difftool: prepare "struct child_process" in cmd_difftool()
(this branch is used by da/difftool.)
* ab/http-pinned-public-key-mismatch (2021-09-27) 1 commit
- http: check CURLE_SSL_PINNEDPUBKEYNOTMATCH when emitting errors
An oddball OPTION_ARGUMENT feature has been removed from the
parse-options API.
HTTPS error handling updates.
Will merge to 'next'?
* ab/test-tool-run-command-cleanup (2021-09-12) 1 commit
(merged to 'next' on 2021-09-13 at 086310d0f4)
+ test-tool run-command: fix flip-flop init pattern
* ab/make-compdb-fix (2021-09-27) 1 commit
- Makefile: pass -Wno-pendantic under GENERATE_COMPILATION_DATABASE=yes
Code clean-up.
Build update.
Will merge to 'next'.
* ab/unused-script-helpers (2021-09-12) 4 commits
(merged to 'next' on 2021-09-15 at 14e6b0f26e)
+ test-lib: remove unused $_x40 and $_z40 variables
+ git-bisect: remove unused SHA-1 $x40 shell variable
+ git-sh-setup: remove unused "pull with rebase" message
+ git-submodule: remove unused is_zero_oid() function
* jk/ref-paranoia (2021-09-27) 16 commits
- refs: drop "broken" flag from for_each_fullref_in()
- ref-filter: drop broken-ref code entirely
- ref-filter: stop setting FILTER_REFS_INCLUDE_BROKEN
- repack, prune: drop GIT_REF_PARANOIA settings
- refs: turn on GIT_REF_PARANOIA by default
- refs: omit dangling symrefs when using GIT_REF_PARANOIA
- refs: add DO_FOR_EACH_OMIT_DANGLING_SYMREFS flag
- refs-internal.h: reorganize DO_FOR_EACH_* flag documentation
- refs-internal.h: move DO_FOR_EACH_* flags next to each other
- t5312: be more assertive about command failure
- t5312: test non-destructive repack
- t5312: create bogus ref as necessary
- t5312: drop "verbose" helper
- t5600: provide detached HEAD for corruption failures
- t5516: don't use HEAD ref for invalid ref-deletion tests
- t7900: clean up some more broken refs
Code clean-up.
The ref iteration code used to optionally allow dangling refs to be
shown, which has been tightened up.
Will merge to 'next'?
* cb/plug-leaks-in-alloca-emu-users (2021-09-16) 2 commits
(merged to 'next' on 2021-09-16 at 2eecae2de3)
+ t0000: avoid masking git exit value through pipes
+ tree-diff: fix leak when not HAVE_ALLOCA_H
* pw/rebase-reread-todo-after-editing (2021-09-24) 2 commits
- rebase: fix todo-list rereading
- sequencer.c: factor out a function
The code to re-read the edited todo list in "git rebase -i" was
made more robust.
Will merge to 'next'.
* rs/close-pack-leakfix (2021-09-24) 1 commit
- packfile: release bad_objects in close_pack()
Leakfix.
* cb/unix-sockets-with-windows (2021-09-14) 3 commits
(merged to 'next' on 2021-09-16 at e2921332ef)
+ git-compat-util: include declaration for unix sockets in windows
+ credential-cache: check for windows specific errors
+ t0301: fixes for windows compatibility
Adjust credential-cache helper to Windows.
* en/am-abort-fix (2021-09-10) 3 commits
(merged to 'next' on 2021-09-13 at 11f3d2dc90)
+ am: fix incorrect exit status on am fail to abort
+ t4151: add a few am --abort tests
+ git-am.txt: clarify --abort behavior
(this branch is used by en/removing-untracked-fixes.)
When "git am --abort" fails to abort correctly, it still exited
with exit status of 0, which has been corrected.
* en/tests-cleanup-leftover-untracked (2021-09-12) 1 commit
(merged to 'next' on 2021-09-13 at cf38118205)
+ tests: remove leftover untracked files
Test clean-up.
* jk/http-server-protocol-versions (2021-09-10) 5 commits
(merged to 'next' on 2021-09-13 at 9174cd6d37)
+ docs/protocol-v2: point readers transport config discussion
+ docs/git: discuss server-side config for GIT_PROTOCOL
+ docs/http-backend: mention v2 protocol
+ http-backend: handle HTTP_GIT_PROTOCOL CGI variable
+ t5551: test v2-to-v0 http protocol fallback
Taking advantage of the CGI interface, http-backend has been
updated to enable protocol v2 automatically when the other side
asks for it.
* jk/strvec-typefix (2021-09-12) 1 commit
(merged to 'next' on 2021-09-13 at e07858581d)
+ strvec: use size_t to store nr and alloc
Correct nr and alloc members of strvec struct to be of type size_t.
* jt/submodule-name-to-gitdir (2021-09-15) 1 commit
(merged to 'next' on 2021-09-16 at c658fbfdb8)
+ submodule: extract path to submodule gitdir func
Code refactoring.
* kz/revindex-comment-fix (2021-09-15) 1 commit
(merged to 'next' on 2021-09-16 at b4797add3a)
+ pack-revindex.h: correct the time complexity descriptions
Header comment fix.
* ma/doc-git-version (2021-09-14) 1 commit
(merged to 'next' on 2021-09-16 at 54a6a3f8b5)
+ documentation: add documentation for 'git version'
Doc update.
* ma/help-w-check-for-requested-page (2021-09-14) 1 commit
(merged to 'next' on 2021-09-16 at 292dd7174d)
+ help: make sure local html page exists before calling external processes
The error in "git help no-such-git-command" is handled better.
* mr/bisect-in-c-4 (2021-09-13) 6 commits
(merged to 'next' on 2021-09-15 at 2af7f048d4)
+ bisect--helper: retire `--bisect-next-check` subcommand
+ bisect--helper: reimplement `bisect_run` shell function in C
+ bisect--helper: reimplement `bisect_visualize()` shell function in C
+ run-command: make `exists_in_PATH()` non-static
+ t6030-bisect-porcelain: add test for bisect visualize
+ t6030-bisect-porcelain: add tests to control bisect run exit cases
Rewrite of "git bisect" in C continues.
* po/git-config-doc-mentions-help-c (2021-09-13) 1 commit
(merged to 'next' on 2021-09-13 at bddbd5c25d)
+ doc: config, tell readers of `git help --config`
Doc update.
* ps/update-ref-batch-flush (2021-09-15) 2 commits
(merged to 'next' on 2021-09-15 at 39a69141e3)
+ t1400: avoid SIGPIPE race condition on fifo
(merged to 'next' on 2021-09-10 at 4ae19a5f34)
+ update-ref: fix streaming of status updates
"git update-ref --stdin" failed to flush its output as needed,
which potentially led the conversation to a deadlock.
* rs/drop-core-compression-vars (2021-09-12) 1 commit
(merged to 'next' on 2021-09-13 at 3bd06626c3)
+ compression: drop write-only core_compression_* variables
Code clean-up.
* rs/packfile-bad-object-list-in-oidset (2021-09-12) 5 commits
(merged to 'next' on 2021-09-13 at 80e72f5f97)
+ packfile: use oidset for bad objects
+ packfile: convert has_packed_and_bad() to object_id
+ packfile: convert mark_bad_packed_object() to object_id
+ midx: inline nth_midxed_pack_entry()
+ oidset: make oidset_size() an inline function
Replace a handcrafted data structure used to keep track of bad
objects in the packfile API by an oidset.
* rs/use-xopen-in-index-pack (2021-09-10) 1 commit
(merged to 'next' on 2021-09-16 at 186eaaae56)
+ index-pack: use xopen in init_thread
Code clean-up.
--------------------------------------------------
[New Topics]
* ab/make-clean-depend-dirs (2021-09-22) 1 commit
- Makefile: clean .depend dirs under COMPUTE_HEADER_DEPENDENCIES != yes
"make clean" has been updated to remove leftover .depend/
directories, even when it is not told to use them to compute header
dependencies.
Will merge to 'next'.
* bs/ls-files-opt-help-text-update (2021-09-22) 1 commit
- ls-files: use imperative mood for -X and -z option description
Help test for "ls-files" options have been updated.
Will merge to 'next'.
* cb/make-compdb-fix (2021-09-22) 1 commit
- Makefile: avoid breaking compilation database generation with DEVELOPER
Adjust to recent change to use -pedantic for developer builds.
Will merge to 'next'.
* ds/perf-test-built-path-fix (2021-09-22) 1 commit
- t/perf/run: fix bin-wrappers computation
Perf test fix.
Will merge to 'next'.
* gc/doc-first-contribution-reroll (2021-09-22) 1 commit
- MyFirstContribution: Document --range-diff option when writing v2
Doc update.
Will merge to 'next'.
* jk/grep-haystack-is-read-only (2021-09-22) 5 commits
- grep: store grep_source buffer as const
- grep: mark "haystack" buffers as const
- grep: stop modifying buffer in grep_source_1()
- grep: stop modifying buffer in show_line()
- grep: stop modifying buffer in strip_timestamp
(this branch is used by hm/paint-hits-in-log-grep.)
Code clean-up in the "grep" machinery.
Will merge to 'next'.
* jk/http-redact-fix (2021-09-22) 1 commit
- http: match headers case-insensitively when redacting
Sensitive data in the HTTP trace were supposed to be redacted, but
we failed to do so in HTTP/2 requests.
Will merge to 'next'.
* js/win-lazyload-buildfix (2021-09-23) 2 commits
- lazyload.h: use an even more generic function pointer than FARPROC
- lazyload.h: fix warnings about mismatching function pointer types
Compilation fix.
Will merge to 'next'.
* ab/auto-depend-with-pedantic (2021-09-22) 1 commit
- Makefile: make COMPUTE_HEADER_DEPENDENCIES=auto work with DEVOPTS=pedantic
Improve build procedure for developers.
Will merge to 'next'.
* ab/make-sparse-for-real (2021-09-22) 1 commit
- Makefile: make the "sparse" target non-.PHONY
Prevent "make sparse" from running for the source files that
haven't been modified.
* bs/difftool-msg-tweak (2021-09-22) 1 commit
- difftool: fix word spacing in the usage strings
Message tweak.
Will merge to 'next'.
* ew/midx-doc-update (2021-09-23) 1 commit
- doc/technical: update note about core.multiPackIndex
Doc tweak.
Will merge to 'next'.
* jt/no-abuse-alternate-odb-for-submodules (2021-09-22) 10 commits
- submodule: trace adding submodule ODB as alternate
- refs: change refs_for_each_ref_in() to take repo
- submodule: pass repo to check_has_commit()
- object-file: only register submodule ODB if needed
- merge-{ort,recursive}: remove add_submodule_odb()
- refs: teach refs_for_each_ref() arbitrary repos
- refs iterator: support non-the_repository advance
- refs: add repo paramater to _iterator_peel()
- refs: make _advance() check struct repo, not flag
- Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-for-submodules
(this branch uses jt/add-submodule-odb-clean-up.)
Follow through the work to use the repo interface to access
submodule objects in-process, instead of abusing the alternate
object database interface.
* tp/send-email-completion (2021-09-22) 3 commits
- send-email docs: add format-patch options
- send-email: move bash completions to core script
- send-email: terminate --git-completion-helper with LF
The command line complation for "git send-email" options have been
tweaked to make it easier to keep it in sync with the command itself.
* hm/paint-hits-in-log-grep (2021-09-23) 3 commits
- pretty: colorize pattern matches in commit messages
- grep: refactor next_match() and match_one_pattern() for external use
- Merge branch 'jk/grep-haystack-is-read-only' into hm/paint-hits-in-log-grep
(this branch uses jk/grep-haystack-is-read-only.)
"git log --grep=string --author=name" learns to highlight hits just
like "git grep string" does.
--------------------------------------------------
[Stalled]
@@ -439,6 +183,143 @@ Release tarballs are available at:
--------------------------------------------------
[Cooking]
* ab/make-clean-depend-dirs (2021-09-22) 1 commit
- Makefile: clean .depend dirs under COMPUTE_HEADER_DEPENDENCIES != yes
"make clean" has been updated to remove leftover .depend/
directories, even when it is not told to use them to compute header
dependencies.
Will merge to 'next'.
* bs/ls-files-opt-help-text-update (2021-09-22) 1 commit
- ls-files: use imperative mood for -X and -z option description
Help test for "ls-files" options have been updated.
Will merge to 'next'.
* ds/perf-test-built-path-fix (2021-09-22) 1 commit
- t/perf/run: fix bin-wrappers computation
Perf test fix.
Will merge to 'next'.
* gc/doc-first-contribution-reroll (2021-09-22) 1 commit
- MyFirstContribution: Document --range-diff option when writing v2
Doc update.
Will merge to 'next'.
* jk/grep-haystack-is-read-only (2021-09-22) 5 commits
- grep: store grep_source buffer as const
- grep: mark "haystack" buffers as const
- grep: stop modifying buffer in grep_source_1()
- grep: stop modifying buffer in show_line()
- grep: stop modifying buffer in strip_timestamp
(this branch is used by hm/paint-hits-in-log-grep.)
Code clean-up in the "grep" machinery.
Will merge to 'next'.
* jk/http-redact-fix (2021-09-22) 1 commit
- http: match headers case-insensitively when redacting
Sensitive data in the HTTP trace were supposed to be redacted, but
we failed to do so in HTTP/2 requests.
Will merge to 'next'.
* js/win-lazyload-buildfix (2021-09-27) 2 commits
- lazyload.h: use an even more generic function pointer than FARPROC
- lazyload.h: fix warnings about mismatching function pointer types
Compilation fix.
Will merge to 'next'.
* ab/auto-depend-with-pedantic (2021-09-22) 1 commit
- Makefile: make COMPUTE_HEADER_DEPENDENCIES=auto work with DEVOPTS=pedantic
Improve build procedure for developers.
Will merge to 'next'.
* ab/make-sparse-for-real (2021-09-22) 1 commit
- Makefile: make the "sparse" target non-.PHONY
Prevent "make sparse" from running for the source files that
haven't been modified.
Will merge to 'next'?
* bs/difftool-msg-tweak (2021-09-22) 1 commit
- difftool: fix word spacing in the usage strings
Message tweak.
Will merge to 'next'.
* ew/midx-doc-update (2021-09-24) 1 commit
- doc/technical: update note about core.multiPackIndex
Doc tweak.
Will merge to 'next'.
* jt/no-abuse-alternate-odb-for-submodules (2021-09-22) 10 commits
. submodule: trace adding submodule ODB as alternate
. refs: change refs_for_each_ref_in() to take repo
. submodule: pass repo to check_has_commit()
. object-file: only register submodule ODB if needed
. merge-{ort,recursive}: remove add_submodule_odb()
. refs: teach refs_for_each_ref() arbitrary repos
. refs iterator: support non-the_repository advance
. refs: add repo paramater to _iterator_peel()
. refs: make _advance() check struct repo, not flag
. Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-for-submodules
(this branch uses jt/add-submodule-odb-clean-up.)
Follow through the work to use the repo interface to access
submodule objects in-process, instead of abusing the alternate
object database interface.
Expecting a reroll on top of the jk/ref-paranoia topic.
* tp/send-email-completion (2021-09-22) 3 commits
- send-email docs: add format-patch options
- send-email: move bash completions to core script
- send-email: terminate --git-completion-helper with LF
The command line complation for "git send-email" options have been
tweaked to make it easier to keep it in sync with the command itself.
* hm/paint-hits-in-log-grep (2021-09-24) 3 commits
- pretty: colorize pattern matches in commit messages
- grep: refactor next_match() and match_one_pattern() for external use
- Merge branch 'jk/grep-haystack-is-read-only' into hm/paint-hits-in-log-grep
(this branch uses jk/grep-haystack-is-read-only.)
"git log --grep=string --author=name" learns to highlight hits just
like "git grep string" does.
* ab/repo-settings-cleanup (2021-09-22) 5 commits
- repository.h: don't use a mix of int and bitfields
- repo-settings.c: simplify the setup
@@ -451,7 +332,7 @@ Release tarballs are available at:
Will merge to 'next'.
* ah/connect-parse-feature-v0-fix (2021-09-23) 1 commit
* ah/connect-parse-feature-v0-fix (2021-09-27) 1 commit
- connect: also update offset for features without values
Protocol v0 clients can get stuck parsing a malformed feature line.
@@ -505,17 +386,24 @@ Release tarballs are available at:
Will merge to 'next'.
* en/removing-untracked-fixes (2021-09-20) 7 commits
* en/removing-untracked-fixes (2021-09-27) 12 commits
- Documentation: call out commands that nuke untracked files/directories
- Comment important codepaths regarding nuking untracked files/dirs
- unpack-trees: avoid nuking untracked dir in way of locally deleted file
- unpack-trees: avoid nuking untracked dir in way of unmerged file
- Split unpack_trees 'reset' flag into two for untracked handling
- Change unpack_trees' 'reset' flag into an enum
- Remove ignored files by default when they are in the way
- unpack-trees: make dir an internal-only struct
- unpack-trees: introduce preserve_ignored to unpack_trees_options
- read-tree, merge-recursive: overwrite ignored files by default
- checkout, read-tree: fix leak of unpack_trees_options.dir
- t2500: add various tests for nuking untracked files
- Merge branch 'en/am-abort-fix' into en/removing-untracked-fixes
Various fixes in code paths that move untracked files away to make room.
Will merge to 'next'?
* en/typofixes (2021-09-20) 2 commits
(merged to 'next' on 2021-09-20 at 48648dafa3)
@@ -584,17 +472,21 @@ Release tarballs are available at:
Will merge to 'master'.
* ns/batched-fsync (2021-09-22) 6 commits
* ns/batched-fsync (2021-09-27) 8 commits
- core.fsyncobjectfiles: performance tests for add and stash
- core.fsyncobjectfiles: tests for batch mode
- unpack-objects: use the bulk-checkin infrastructure
- update-index: use the bulk-checkin infrastructure
- core.fsyncobjectfiles: add windows support for batch mode
- core.fsyncobjectfiles: batched disk flushes
- bulk-checkin: rename 'state' variable and separate 'plugged' boolean
- object-file.c: do not rename in a temp odb
The "core.fsyncobjectfiles" configuration variable can now be set
to "batch" for improved performance.
Will merge to 'next'?
* jh/builtin-fsmonitor-part1 (2021-09-20) 7 commits
- t/helper/simple-ipc: convert test-simple-ipc to use start_bg_command
@@ -674,10 +566,11 @@ Release tarballs are available at:
"git repack" has been taught to generate multi-pack reachability
bitmaps.
Will merge to 'next'?
Under review.
cf. <YU0TS+KsWY36oeKU@nand.local>
* ds/add-rm-with-sparse-index (2021-09-22) 14 commits
* ds/add-rm-with-sparse-index (2021-09-24) 13 commits
- advice: update message to suggest '--sparse'
- mv: refuse to move sparse paths
- rm: skip sparse paths with missing SKIP_WORKTREE
@@ -689,7 +582,6 @@ Release tarballs are available at:
- add: fail when adding an untracked sparse file
- dir: fix pattern matching on dirs
- dir: select directories correctly
- dir: extract directory-matching logic
- t1092: behavior for adding sparse files
- t3705: test that 'sparse_entry' is unstaged
@@ -697,6 +589,8 @@ Release tarballs are available at:
updating paths outside of the sparse-checkout definition unless
the user specifies a "--sparse" option.
Will merge to 'next'?
* tb/midx-write-propagate-namehash (2021-09-17) 7 commits
- t5326: test propagating hashcache values
@@ -710,7 +604,7 @@ Release tarballs are available at:
"git multi-pack-index write --bitmap" learns to propagate the
hashcache from original bitmap to resulting bitmap.
Will merge to 'next'?
Will merge to 'next'.
* pw/rebase-of-a-tag-fix (2021-09-22) 10 commits
@@ -729,7 +623,7 @@ Release tarballs are available at:
it mistakenly tried to write the tag object instead of peeling it
to HEAD.
Will merge to 'next'?
Will merge to 'next'.
* en/zdiff3 (2021-09-20) 2 commits
@@ -791,6 +685,8 @@ Release tarballs are available at:
Add pieces from "scalar" to contrib/.
Will merge to 'next'?
* ab/sanitize-leak-ci (2021-09-23) 2 commits
- tests: add a test mode for SANITIZE=leak, run it in CI
@@ -840,6 +736,8 @@ Release tarballs are available at:
used to show the difference between mechanical (and possibly
conflicted) merge results and the recorded resolution.
Will merge to 'next'?
* sg/test-split-index-fix (2021-09-07) 7 commits
- read-cache: fix GIT_TEST_SPLIT_INDEX
@@ -878,6 +776,8 @@ Release tarballs are available at:
Updates to the tests in t0000 to test the test framework.
Will merge to 'next'?
* ab/only-single-progress-at-once (2021-09-22) 8 commits
- progress.c: add & assert a "global_progress" variable
@@ -1135,3 +1035,13 @@ Release tarballs are available at:
Revamp the hooks subsystem to allow multiple of them to trigger
upon the same event and control via the configuration variables.
* cb/make-compdb-fix (2021-09-22) 1 commit
. Makefile: avoid breaking compilation database generation with DEVELOPER
Adjust to recent change to use -pedantic for developer builds.
Replaced by the ab/make-compdb-fix topic that uses the same
approach as the ab/auto-depend-with-pedantic topic.