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 B1DB8ECAAD3 for ; Fri, 16 Sep 2022 02:47:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229658AbiIPCrR (ORCPT ); Thu, 15 Sep 2022 22:47:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229538AbiIPCrP (ORCPT ); Thu, 15 Sep 2022 22:47:15 -0400 Received: from pb-smtp20.pobox.com (pb-smtp20.pobox.com [173.228.157.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DAF2979C0 for ; Thu, 15 Sep 2022 19:47:12 -0700 (PDT) Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 951031BC0AF; Thu, 15 Sep 2022 22:47:12 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to :subject:date:message-id:mime-version:content-type; s=sasl; bh=3 bc3mOns198Tup51acFeOBrpJNYYTa4H7Qpbd4NQltQ=; b=H9KqMXLyWg5J6/Aew GleZ3v5PYSufGIiRtsE/D87auYIwm4iCU02gSuG98yfrdKuDyHuC0pSyVaY6auCU 26pNOUx1D9Z4lb1TJ7RZzEl3s2MeZ2xLyeyl+cBOoCiN7hf4fBo1R6nidAT6KTvJ ZGavIi7nZ7oSEY7e+dTCT0gykA= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 8CB8E1BC0AE; Thu, 15 Sep 2022 22:47:12 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.83.5.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 2890D1BC0AD; Thu, 15 Sep 2022 22:47:09 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: git@vger.kernel.org Subject: What's cooking in git.git (Sep 2022, #04; Thu, 15) X-master-at: d3fa443f97e3a8d75b51341e2d5bac380b7422df X-next-at: 21cbab75150d71ca294e09180c59ee529ca53957 Date: Thu, 15 Sep 2022 19:47:07 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: DBAE2798-3569-11ED-A02F-C2DA088D43B2-77302942!pb-smtp20.pobox.com 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. I tagged the tip of the 'master' branch as 2.38-rc0, aka "preview", but since many folks are away attending Git Merge, expect not much activity on the release. The first "release candidate" that signals the start of pre-release feature freeze is scheduled to happen mid next week (cf. http://tinyurl.com/gitCal). 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/ -------------------------------------------------- [Graduated to 'master'] * ab/dedup-config-and-command-docs (2022-09-07) 9 commits (merged to 'next' on 2022-09-08 at cd5b217110) + docs: add CONFIGURATION sections that fuzzy map to built-ins + docs: add CONFIGURATION sections that map to a built-in + log docs: de-duplicate configuration sections + difftool docs: de-duplicate configuration sections + notes docs: de-duplicate and combine configuration sections + apply docs: de-duplicate configuration sections + send-email docs: de-duplicate configuration sections + grep docs: de-duplicate configuration sections + docs: add and use include template for config/* includes Share the text used to explain configuration variables used by "git " in "git help " with the text from "git help config". cf. source: * ab/submodule-helper-leakfix (2022-09-02) 18 commits (merged to 'next' on 2022-09-08 at bf21cfed4b) + submodule--helper: fix a configure_added_submodule() leak + submodule--helper: free rest of "displaypath" in "struct update_data" + submodule--helper: free some "displaypath" in "struct update_data" + submodule--helper: fix a memory leak in print_status() + submodule--helper: fix a leak in module_add() + submodule--helper: fix obscure leak in module_add() + submodule--helper: fix "reference" leak + submodule--helper: fix a memory leak in get_default_remote_submodule() + submodule--helper: fix a leak with repo_clear() + submodule--helper: fix "sm_path" and other "module_cb_list" leaks + submodule--helper: fix "errmsg_str" memory leak + submodule--helper: add and use *_release() functions + submodule--helper: don't leak {run,capture}_command() cp.dir argument + submodule--helper: "struct pathspec" memory leak in module_update() + submodule--helper: fix most "struct pathspec" memory leaks + submodule--helper: fix trivial get_default_remote_submodule() leak + submodule--helper: fix a leak in "clone_submodule" + Merge branch 'ab/submodule-helper-prep' into ab/submodule-helper-leakfix Plugging leaks in submodule--helper. source: * ab/unused-annotation (2022-09-01) 2 commits (merged to 'next' on 2022-09-08 at dfc6123c6b) + git-compat-util.h: use "deprecated" for UNUSED variables + git-compat-util.h: use "UNUSED", not "UNUSED(var)" (this branch uses jk/unused-annotation.) Undoes 'jk/unused-annotation' topic and redoes it to work around Coccinelle rules misfiring false positives in unrelated codepaths. source: * en/remerge-diff-fixes (2022-09-02) 3 commits (merged to 'next' on 2022-09-12 at 9879cec049) + diff: fix filtering of merge commits under --remerge-diff + diff: fix filtering of additional headers under --remerge-diff + diff: have submodule_format logic avoid additional diff headers Fix a few "git log --remerge-diff" bugs. source: * jk/plug-list-object-filter-leaks (2022-09-08) 5 commits (merged to 'next' on 2022-09-08 at a6b4b080e4) + prepare_repo_settings(): plug leak of config values + list_objects_filter_options: plug leak of filter_spec strings + transport: free filter options in disconnect_git() + transport: deep-copy object-filter struct for fetch-pack + list_objects_filter_copy(): deep-copy sparse_oid_name field (this branch is used by jk/list-objects-filter-cleanup.) The code that manages list-object-filter structure, used in partial clones, leaked the instances, which has been plugged. source: * jk/proto-v2-ref-prefix-fix (2022-09-08) 2 commits (merged to 'next' on 2022-09-12 at 70c5528b86) + fetch: add branch.*.merge to default ref-prefix extension + fetch: stop checking for NULL transport->remote in do_fetch() "git fetch" over protocol v2 sent an incorrect ref prefix request to the server and made "git pull" with configured fetch refspec that does not cover the remote branch to merge with fail, which has been corrected. source: * jk/unused-annotation (2022-08-19) 11 commits (merged to 'next' on 2022-08-24 at 2174b8c75d) + is_path_owned_by_current_uid(): mark "report" parameter as unused + run-command: mark unused async callback parameters + mark unused read_tree_recursive() callback parameters + hashmap: mark unused callback parameters + config: mark unused callback parameters + streaming: mark unused virtual method parameters + transport: mark bundle transport_options as unused + refs: mark unused virtual method parameters + refs: mark unused reflog callback parameters + refs: mark unused each_ref_fn parameters + git-compat-util: add UNUSED macro (this branch is used by ab/unused-annotation.) Annotate function parameters that are not used (but cannot be removed for structural reasons), to prepare us to later compile with -Wunused warning turned on. source: * js/typofix (2022-09-12) 1 commit (merged to 'next' on 2022-09-12 at 76d57e004b) + Documentation: fix various repeat word typos Typofix. source: <20220911102320.39954-2-jacob@initialcommit.io> * rs/add-p-worktree-mode-prompt-fix (2022-09-14) 1 commit (merged to 'next' on 2022-09-14 at 5f29a569d4) + add -p: fix worktree patch mode prompts Fix another UI regression in the reimplemented "add -p". source: <2463c4b9-313b-032f-9313-d1421f71f111@web.de> -------------------------------------------------- [New Topics] * ed/fsmonitor-on-networked-macos (2022-09-13) 5 commits - fsmonitor: add documentation for allowRemote and socketDir options - fsmonitor: deal with synthetic firmlinks on macOS - fsmonitor: avoid socket location check if using hook - fsmonitor: relocate socket file if .git directory is remote - fsmonitor: refactor filesystem checks to common interface By default, use of fsmonitor on a repository on networked filesystem is disabled. Add knobs to make it workable on macOS. Needs review. source: * rj/branch-edit-description-with-nth-checkout (2022-09-12) 2 commits - branch: support for shortcuts like @{-1} completed - branch: refactor "edit_description" code path "git branch --edit-description @{-1}" is now a way to edit branch description of the branch you were on before switching to the current branch. Needs review. source: <7abdb5a9-5707-7897-4196-8d2892beeb81@gmail.com> * mj/credential-helper-auth-headers (2022-09-13) 8 commits - http: set specific auth scheme depending on credential - http: move proactive auth to first slot creation - http: store all request headers on active_request_slot - credential: add WWW-Authenticate header to cred requests - http: read HTTP WWW-Authenticate response headers - osxkeychain: clarify that we ignore unknown lines - netrc: ignore unknown lines (do not die) - wincred: ignore unknown lines (do not die) RFC source: * ec/reftable-pass-pq-entry-by-reference (2022-09-15) 1 commit (merged to 'next' on 2022-09-15 at 928e75c7d1) + reftable: use a pointer for pq_entry param Small code clean-up in reftable implementation. Will merge to 'master'. source: <1833f3928cb.acf3c97d869879.7909589521159235166@elijahpepe.com> * jc/environ-docs (2022-09-15) 5 commits - environ: GIT_INDEX_VERSION affects not just a new repository - environ: simplify description of GIT_INDEX_FILE - environ: GIT_FLUSH should be made a usual Boolean - environ: explain Boolean environment variables - environ: document GIT_SSL_NO_VERIFY Documentation on various Boolean GIT_* environment variables have been clarified. Needs review. source: <20220915160659.126441-1-gitster@pobox.com> * rs/diff-caret-bang-with-parents (2022-09-15) 6 commits - revision: add parents after child for ^! - revision: rename add_parents_only() to add_nth_parent() - revision: factor out add_parents() - revision: factor out add_parent() - revision: factor out get_commit() - revision: use strtol_i() for exclude_parent "git diff rev^!" did not show combined diff to go to the rev from its parents. Needs review. source: -------------------------------------------------- [Stalled] * es/mark-gc-cruft-as-experimental (2022-08-03) 2 commits - config: let feature.experimental imply gc.cruftPacks=true - gc: add tests for --cruft and friends Enable gc.cruftpacks by default for those who opt into feature.experimental setting. Expecting a reroll. cf. <220804.86a68ke9d5.gmgdl@evledraar.gmail.com> cf. <6803b725-526e-a1c8-f15c-a9ed4a144d4c@github.com> source: <20220803205721.3686361-1-emilyshaffer@google.com> * es/doc-creation-factor-fix (2022-07-28) 2 commits - range-diff: clarify --creation-factor= - format-patch: clarify --creation-factor= Expecting a reroll by somebody more familiar with the logic cf. source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr> * cw/remote-object-info (2022-08-13) 7 commits - SQUASH??? - cat-file: add remote-object-info to batch-command - transport: add client support for object-info - serve: advertise object-info feature - protocol-caps: initialization bug fix - fetch-pack: move fetch initialization - fetch-pack: refactor packet writing A client component to talk with the object-info endpoint. Expecting a reroll. cf. <20220728230210.2952731-1-calvinwan@google.com> cf. source: <20220728230210.2952731-1-calvinwan@google.com> -------------------------------------------------- [Cooking] * jk/list-objects-filter-cleanup (2022-09-12) 5 commits (merged to 'next' on 2022-09-12 at 33cb79c924) + list-objects-filter: convert filter_spec to a strbuf + list-objects-filter: add and use initializers + list-objects-filter: handle null default filter spec + list-objects-filter: don't memset after releasing filter struct + Merge branch 'jk/plug-list-object-filter-leaks' into jk/list-objects-filter-cleanup A couple of bugfixes with code clean-up. Will merge to 'master'. source: * zh/ls-files-format (2022-09-12) 1 commit (merged to 'next' on 2022-09-12 at 91dda58387) + ls-files: fix black space in error message Typofix in the UI of a topic that has graduated to 'master'. Will merge to 'master'. source: * ab/doc-synopsis-and-cmd-usage (2022-09-07) 34 commits - tests: start asserting that *.txt SYNOPSIS matches -h output - doc txt & -h consistency: make "worktree" consistent - worktree: define subcommand -h in terms of command -h - reflog doc: list real subcommands up-front - doc txt & -h consistency: make "commit" consistent - doc txt & -h consistency: make "diff-tree" consistent - doc txt & -h consistency: use "[