From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D5E0C636CC for ; Fri, 3 Feb 2023 04:02:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232361AbjBCECx (ORCPT ); Thu, 2 Feb 2023 23:02:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232353AbjBCECu (ORCPT ); Thu, 2 Feb 2023 23:02:50 -0500 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A643549022 for ; Thu, 2 Feb 2023 20:02:44 -0800 (PST) Received: by mail-pl1-x632.google.com with SMTP id h9so4040509plf.9 for ; Thu, 02 Feb 2023 20:02:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:date:subject:to:from:sender:from :to:cc:subject:date:message-id:reply-to; bh=we3+vZhnrFpP8tauvV81ZWItVf7tz2W2q+gSLVLcBA8=; b=QWGtxFbNmY18Yfj2b90S8HZvkY6Gi27+4duUwkAIlvJRGgPgCHRYoon3HZSKiC5Mkl kTQ6C68RZdEcakPNwENFHQi3FLsdV+5h5GQmlv2W6WuR2Pme3KrlAKfBp/4wEhQjxO00 aHeUXlDRimQ/vsFIxL2W+2aP8tophr6lz7366YjoOezSev9IVFr5Pn77+yvLxL0MHVdp mL922nNyuWjWTd62ncJDXzN8/9ONlsOQtgaPGnBejvwoE8w+Jzz/ZvIQXJT51U0cjmHk oahxC9fu39doq4s6n9pfQBh/HdOcrURHVKkjkv9cv6OvQgSLspEuTQKwaKMXE6FQrkhq 0KyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:date:subject:to:from:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=we3+vZhnrFpP8tauvV81ZWItVf7tz2W2q+gSLVLcBA8=; b=dbuqg7YwNzRjNotyw/MMILKg06S7ncHYSdjLD2YrY/vxGivqF5otZndOQ9HlfQufkw yWCtr38OPVD3Rcjjojwug+aZ9K0g7G/JF9fkjnPF6sy4VaFltr4LB3Xm49KlL1/ampsJ 2fksRn8RWGP6T/KVLSJZohodAhXHjdkxe3zE32N3yOmBUnwBeLVok7c9bjX4NNqxXRFd dvs34dNjIeKkEInMYk4Tp86Jlc7u0j2e13K6n+QF0LkvcbLOCkZFtzwJUhPMrGrGZMk5 PCasoHaw+9y/2t3verJaHvUhPLFl6n3eh99Benig0oLVxLvx6y6o1qMGZaIa1UzCFZY3 1NNA== X-Gm-Message-State: AO0yUKW65iJ1lyqw8YsXFz15NeK56CRBAAKaSYG42SCeaiLb6i3B4bXr sR7uULK6XrmGSuVGDDyBjdhiBGaGwrA= X-Google-Smtp-Source: AK7set+wjQdCsyyuTrpfl0A1N/S2VXeIcY0k3V/lKiPgSlTvmnHjFvxS3BsVT+5qHpCSJOwpA0oZKw== X-Received: by 2002:a17:903:2342:b0:196:595b:2580 with SMTP id c2-20020a170903234200b00196595b2580mr10964024plh.0.1675396963453; Thu, 02 Feb 2023 20:02:43 -0800 (PST) Received: from localhost (137.22.168.34.bc.googleusercontent.com. [34.168.22.137]) by smtp.gmail.com with ESMTPSA id v23-20020a17090331d700b001968b529c98sm460124ple.128.2023.02.02.20.02.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Feb 2023 20:02:43 -0800 (PST) Sender: Junio C Hamano From: Junio C Hamano To: git@vger.kernel.org Subject: What's cooking in git.git (Feb 2023, #01; Thu, 2) X-master-at: 2fc9e9ca3c7505bc60069f11e7ef09b1aeeee473 X-next-at: 98d13ac3e7da4ec0524fa5d9aa17447fe57bbb77 Date: Thu, 02 Feb 2023 20:02:42 -0800 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Here are the topics that have been cooking in my tree. Commits prefixed with '+' are in 'next' (being in 'next' is a sign that a topic is stable enough to be used and are candidate to be in a future release). Commits prefixed with '-' are only in 'seen', and aren't considered "accepted" at all. A topic without enough support may be discarded after a long period of no activity. 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 repositories have only a subset of branches. With maint, master, next, seen, todo: git://git.kernel.org/pub/scm/git/git.git/ git://repo.or.cz/alt-git.git/ https://kernel.googlesource.com/pub/scm/git/git/ https://github.com/git/git/ https://gitlab.com/git-vcs/git/ With all the integration branches and topics broken out: https://github.com/gitster/git/ Even though the preformatted documentation in HTML and man format are not sources, they are published in these repositories for convenience (replace "htmldocs" with "manpages" for the manual pages): git://git.kernel.org/pub/scm/git/git-htmldocs.git/ https://github.com/gitster/git-htmldocs.git/ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- [New Topics] * ab/imap-send-requires-curl (2023-02-02) 6 commits - imap-send: correctly report "host" when using "tunnel" - imap-send: remove old --no-curl codepath - imap-send: make --curl no-optional - imap-send: replace auto-probe libcurl with hard dependency - imap-send doc: the imap.sslVerify is used with imap.tunnel - imap-send: note "auth_method", not "host" on auth method failure Give a hard dependency on cURL library to build "git imap-send", and remove the code to interact with IMAP server without using cURL. Comments? source: * gc/index-format-doc (2023-02-01) 1 commit - docs: document zero bits in index "mode" Doc update. Will merge to 'next'. source: <20230201024041.29401-1-chooglen@google.com> * jk/httpd-test-updates (2023-02-01) 4 commits - t/lib-httpd: increase ssl key size to 2048 bits - t/lib-httpd: drop SSLMutex config - t/lib-httpd: bump required apache version to 2.4 - t/lib-httpd: bump required apache version to 2.2 Test update. Will merge to 'next'. source: * rd/doc-default-date-format (2023-02-01) 1 commit - rev-list: clarify git-log default date format Update --date=default documentation. source: <20230201155712.86577-1-rafael@dulfer.be> * ew/free-island-marks (2023-02-02) 1 commit - delta-islands: free island_marks and bitmaps "git pack-objects" learned to release delta-island bitmap data when it is done using it, saving peak heap memory usage. Will merge to 'next'. source: <20230202094217.M955476@dcvr> * hj/remove-msys-support (2023-02-02) 2 commits - mingw: remove msysGit/MSYS1 support - mingw: remove duplicate `USE_NED_ALLOCATOR` directive Remove support for MSys, which now lags way behind MSys2. Will merge to 'next'. source: * sk/winansi-createthread-fix (2023-02-01) 1 commit - compat/winansi: check for errors of CreateThread() correctly Fix use of CreateThread() API call made early in the windows start-up code. Will merge to 'next'. source: -------------------------------------------------- [Stalled] * rj/branch-unborn-in-other-worktrees (2023-01-19) 3 commits - branch: rename orphan branches in any worktree - branch: description for orphan branch errors - avoid unnecessary worktrees traversing Error messages given when working on an unborn branch that is checked out in another worktree have been improvved. Expecting a reroll. cf. <527f7315-be7b-7ec0-04fc-d07da7d4fefa@gmail.com> source: <34a58449-4f2e-66ef-ea01-119186aebd23@gmail.com> * ja/worktree-orphan (2023-01-13) 4 commits - worktree add: add hint to direct users towards --orphan - worktree add: add --orphan flag - worktree add: refactor opt exclusion tests - worktree add: include -B in usage docs 'git worktree add' learned how to create a worktree based on an orphaned branch with `--orphan`. Expecting a reroll. cf. <11be1b0e-ee38-119f-1d80-cb818946116b@dunelm.org.uk> source: <20230109173227.29264-1-jacobabel@nullpo.dev> * ab/avoid-losing-exit-codes-in-tests (2022-12-20) 6 commits - tests: don't lose misc "git" exit codes - tests: don't lose "git" exit codes in "! ( git ... | grep )" - tests: don't lose exit status with "test $(git ...)" - tests: don't lose exit status with "(cd ...; test $(git ...))" - t/lib-patch-mode.sh: fix ignored exit codes - auto-crlf tests: don't lose exit code in loops and outside tests Test clean-up. Expecting a hopefully minor and final reroll. cf. <1182283a-4a78-3c99-e716-a8c3e58a5823@web.de> cf. source: * tl/notes--blankline (2022-11-09) 5 commits - notes.c: introduce "--no-blank-line" option - notes.c: provide tips when target and append note are both empty - notes.c: drop unreachable code in 'append_edit()' - notes.c: cleanup for "designated init" and "char ptr init" - notes.c: cleanup 'strbuf_grow' call in 'append_edit' 'git notes append' was taught '--[no-]blank-line' to conditionally add a LF between a new and existing note. Expecting a reroll. cf. source: * mc/switch-advice (2022-11-09) 1 commit - po: use `switch` over `checkout` in error message Use 'switch' instead of 'checkout' in an error message. Waiting for review response. source: * js/range-diff-mbox (2022-11-23) 1 commit - range-diff: support reading mbox files 'git range-diff' gained support for reading either side from an .mbox file instead of a revision range. Waiting for review response. cf. source: * ab/tag-object-type-errors (2022-11-22) 5 commits - tag: don't emit potentially incorrect "object is a X, not a Y" - tag: don't misreport type of tagged objects in errors - object tests: add test for unexpected objects in tags - object-file.c: free the "t.tag" in check_tag() - Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors Hardening checks around mismatched object types when one of those objects is a tag. Expecting a reroll. cf. cf. source: * ed/fsmonitor-inotify (2022-12-13) 6 commits - fsmonitor: update doc for Linux - fsmonitor: test updates - fsmonitor: enable fsmonitor for Linux - fsmonitor: implement filesystem change listener for Linux - fsmonitor: determine if filesystem is local or remote - fsmonitor: prepare to share code between Mac OS and Linux Bundled fsmonitor for Linux using inotify API. Needs review on the updated round. source: * jc/spell-id-in-both-caps-in-message-id (2022-12-17) 1 commit - e-mail workflow: Message-ID is spelled with ID in both capital letters Consistently spell "Message-ID" as such, not "Message-Id". Needs review. source: * ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit - test-lib: allow storing counts with test harnesses Allow summary results from tests to be written to t/test-results directory even when a test harness like 'prove' is in use. Needs review. source: <20221224225200.1027806-1-adam@dinwoodie.org> * so/diff-merges-more (2022-12-18) 5 commits - diff-merges: improve --diff-merges documentation - diff-merges: issue warning on lone '-m' option - diff-merges: support list of values for --diff-merges - diff-merges: implement log.diffMerges-m-imply-p config - diff-merges: implement [no-]hide option and log.diffMergesHide config Assorted updates to "--diff-merges=X" option. May want to discard. Breaking compatibility does not seem worth it. source: <20221217132955.108542-1-sorganov@gmail.com> -------------------------------------------------- [Cooking] * ab/config-multi-and-nonbool (2023-02-02) 9 commits - for-each-repo: with bad config, don't conflate and - config API: add "string" version of *_value_multi(), fix segfaults - config API users: test for *_get_value_multi() segfaults - for-each-repo: error on bad --config - config API: have *_multi() return an "int" and take a "dest" - versioncmp.c: refactor config reading next commit - config API: add and use a "git_config_get()" family of functions - config tests: add "NULL" tests for *_get_value_multi() - config tests: cover blind spots in git_die_config() tests Assorted config API updates. source: * ds/scalar-ignore-cron-error (2023-01-27) 3 commits (merged to 'next' on 2023-01-31 at 98d13ac3e7) + scalar: only warn when background maintenance fails + t921*: test scalar behavior starting maintenance + t: allow 'scalar' in test_must_fail Allow "scalar" to warn but continue when its periodic maintenance feature cannot be enabled. Will merge to 'master'. source: * mh/doc-credential-cache-only-in-core (2023-01-29) 1 commit (merged to 'next' on 2023-01-30 at 021b5227af) + Documentation: clarify that cache forgets credentials if the system restarts Documentation clarification. Will merge to 'master'. source: * ab/hook-api-with-stdin (2023-01-23) 5 commits - hook: support a --to-stdin= option for testing - sequencer: use the new hook API for the simpler "post-rewrite" call - hook API: support passing stdin to hooks, convert am's 'post-rewrite' - run-command: allow stdin for run_processes_parallel - run-command.c: remove dead assignment in while-loop Extend the run-hooks API to allow feeding data from the standard input when running the hook script(s). Expecting review responses. source: * as/ssh-signing-improve-key-missing-error (2023-01-25) 1 commit (merged to 'next' on 2023-01-25 at 140f2c2c60) + ssh signing: better error message when key not in agent Improve the error message given when private key is not loaded in the ssh agent in the codepath to sign with an ssh key. Will merge to 'master'. source: * en/rebase-incompatible-opts (2023-01-25) 10 commits (merged to 'next' on 2023-01-27 at 35a67cf2c6) + rebase: provide better error message for apply options vs. merge config + rebase: put rebase_options initialization in single place + rebase: fix formatting of rebase --reapply-cherry-picks option in docs + rebase: clarify the OPT_CMDMODE incompatibilities + rebase: add coverage of other incompatible options + rebase: fix incompatiblity checks for --[no-]reapply-cherry-picks + rebase: fix docs about incompatibilities with --root + rebase: remove --allow-empty-message from incompatible opts + rebase: flag --apply and --merge as incompatible + rebase: mark --update-refs as requiring the merge backend "git rebase" often ignored incompatible options instead of complaining, which has been corrected. Will merge to 'master'. Replaces en/rebase-update-refs-needs-merge-backend. source: * gm/request-pull-with-non-pgp-signed-tags (2023-01-25) 1 commit (merged to 'next' on 2023-01-30 at abc684d8df) + request-pull: filter out SSH/X.509 tag signatures Adjust "git request-pull" to strip embedded signature from signed tags to notice non-PGP signatures. Will merge to 'master'. source: <20230125234725.3918563-1-gwymor@tilde.club> * cb/grep-fallback-failing-jit (2023-01-31) 1 commit - grep: fall back to interpreter if JIT memory allocation fails In an environment where dynamically generated code is prohibited to run (e.g. SELinux), failure to JIT pcre patterns is expected. Fall back to interpreted execution in such a case. Will merge to 'next'? source: <20230131185611.520311-1-minipli@grsecurity.net> * cb/checkout-same-branch-twice (2023-01-20) 1 commit - checkout/switch: disallow checking out same branch in multiple worktrees "git checkout -B $branch" failed to protect against checking out a branch that is checked out elsewhere, unlike "git branch -f" did. Expecting a hopefully minor and final reroll. cf. <8f24fc3c-c30f-dc70-5a94-5ee4ed3de102@dunelm.org.uk> source: <20230120113553.24655-1-carenas@gmail.com> * ab/sequencer-unleak (2023-01-18) 8 commits - commit.c: free() revs.commit in get_fork_point() - builtin/rebase.c: free() "options.strategy_opts" - sequencer.c: always free() the "msgbuf" in do_pick_commit() - builtin/rebase.c: fix "options.onto_name" leak - builtin/revert.c: move free-ing of "revs" to replay_opts_release() - rebase & sequencer API: fix get_replay_opts() leak in "rebase" - sequencer.c: split up sequencer_remove_state() - rebase: use "cleanup" pattern in do_interactive_rebase() Plug leaks in sequencer subsystem and its users. Expecting a hopefully minor and final reroll. cf. source: * jc/attr-doc-fix (2023-01-26) 1 commit (merged to 'next' on 2023-01-26 at cb327c4b5f) + attr: fix instructions on how to check attrs Comment fix. Will merge to 'master'. source: * rj/avoid-switching-to-already-used-branch (2023-01-22) 3 commits - switch: reject if the branch is already checked out elsewhere (test) - rebase: refuse to switch to a branch already checked out elsewhere (test) - branch: fix die_if_checked_out() when ignore_current_worktree A few subcommands have been taught to stop users from working on a branch that is being used in another worktree linked to the same repository. Expecting a hopefully minor and final reroll. cf. source: * rj/bisect-already-used-branch (2023-01-22) 1 commit - bisect: fix "reset" when branch is checked out elsewhere Allow "git bisect reset [name]" to check out the named branch (or the original one) even when the branch is already checked out in a different worktree linked to the same repository. Leaning negative. Why is it a good thing? cf. source: <1c36c334-9f10-3859-c92f-3d889e226769@gmail.com> * en/ls-files-doc-update (2023-01-13) 4 commits (merged to 'next' on 2023-01-27 at 20b9803add) + ls-files: guide folks to --exclude-standard over other --exclude* options + ls-files: clarify descriptions of status tags for -t + ls-files: clarify descriptions of file selection options + ls-files: add missing documentation for --resolve-undo option Doc update to ls-files. Will merge to 'master'. source: * ms/send-email-feed-header-to-validate-hook (2023-01-19) 2 commits - send-email: expose header information to git-send-email's sendemail-validate hook - send-email: refactor header generation functions "git send-email" learned to give the e-mail headers to the validate hook by passing an extra argument from the command line. Expecting a hopefully minor and final reroll. cf. source: <20230120012459.920932-1-michael.strawbridge@amd.com> * ds/bundle-uri-5 (2023-01-31) 11 commits - bundle-uri: test missing bundles with heuristic - bundle-uri: store fetch.bundleCreationToken - fetch: fetch from an external bundle URI - bundle-uri: drop bundle.flag from design doc - clone: set fetch.bundleURI if appropriate - bundle-uri: download in creationToken order - bundle-uri: parse bundle..creationToken values - bundle-uri: parse bundle.heuristic=creationToken - t5558: add tests for creationToken heuristic - bundle: verify using check_connected() - bundle: test unbundling with incomplete history The bundle-URI subsystem adds support for creation-token heuristics to help incremental fetches. Will merge to 'next'? source: * tc/cat-file-z-use-cquote (2023-01-16) 1 commit - cat-file: quote-format name in error when using -z "cat-file" in the batch mode that is fed NUL-terminated pathnames learned to cquote them in its error output (otherwise, a funny pathname with LF in it would break the lines in the output stream). Expecting a reroll. cf. <2a2a46f0-a9bc-06a6-72e1-28800518777c@dunelm.org.uk> source: <20230116190749.4141516-1-toon@iotcl.com> * cw/submodule-status-in-parallel (2023-01-17) 6 commits - submodule: call parallel code from serial status - diff-lib: parallelize run_diff_files for submodules - diff-lib: refactor match_stat_with_submodule - submodule: move status parsing into function - submodule: strbuf variable rename - run-command: add duplicate_output_fn to run_processes_parallel_opts "git submodule status" learned to run the comparison in submodule repositories in parallel. Expecting a reroll. cf. cf. source: <20230104215415.1083526-1-calvinwan@google.com> * ab/various-leak-fixes (2023-02-02) 19 commits - push: free_refs() the "local_refs" in set_refspecs() - push: refactor refspec_append_mapped() for subsequent leak-fix - receive-pack: free() the "ref_name" in "struct command" - grep API: plug memory leaks by freeing "header_list" - grep.c: refactor free_grep_patterns() - builtin/merge.c: free "&buf" on "Your local changes..." error - builtin/merge.c: use fixed strings, not "strbuf", fix leak - show-branch: free() allocated "head" before return - commit-graph: fix a parse_options_concat() leak - http-backend.c: fix cmd_main() memory leak, refactor reg{exec,free}() - http-backend.c: fix "dir" and "cmd_arg" leaks in cmd_main() - worktree: fix a trivial leak in prune_worktrees() - repack: fix leaks on error with "goto cleanup" - name-rev: don't xstrdup() an already dup'd string - various: add missing clear_pathspec(), fix leaks - clone: use free() instead of UNLEAK() - commit-graph: use free_commit_graph() instead of UNLEAK() - bundle.c: don't leak the "args" in the "struct child_process" - tests: mark tests as passing with SANITIZE=leak Leak fixes. Comments? source: -------------------------------------------------- [Discarded] * mc/credential-helper-auth-headers (2023-01-20) 12 commits (merged to 'next' on 2023-01-25 at cb95006bb2) + credential: add WWW-Authenticate header to cred requests + http: read HTTP WWW-Authenticate response headers + http: replace unsafe size_t multiplication with st_mult + test-http-server: add sending of arbitrary headers + test-http-server: add simple authentication + test-http-server: pass Git requests to http-backend + test-http-server: add HTTP request parsing + test-http-server: add HTTP error response function + test-http-server: add stub HTTP server test helper + daemon: rename some esoteric/laboured terminology + daemon: libify child process handling functions + daemon: libify socket setup and option functions Extending credential helper protocol. The test-only server is an eyesore. cf. cf. source: