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 03837C6FA83 for ; Tue, 27 Sep 2022 21:11:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232246AbiI0VLP (ORCPT ); Tue, 27 Sep 2022 17:11:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231981AbiI0VLM (ORCPT ); Tue, 27 Sep 2022 17:11:12 -0400 Received: from pb-smtp1.pobox.com (pb-smtp1.pobox.com [64.147.108.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D10111DCC55 for ; Tue, 27 Sep 2022 14:11:07 -0700 (PDT) Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 1F45E14DBFC; Tue, 27 Sep 2022 17:11:06 -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=M J3CHl1yHHFJVXYlYB1F0Byv5kOhg05ZANdE6XC3EIE=; b=eHJ9rAU5FaXM4RLXw 6lv3dBH9rPIb+SUKR1gZh8g92YV9akc8Sbbocz94iEm2p6RV+KC7+QdfBw18uW8Y oJ3ZTPxCeF6J0rfaHLGpOQ9Fbj+8oFD4tlyYvzl8akoeLvgij1KWldoCveyavn1J KSiG1Pzt6fC6OrkOxugzUNCjQQ= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 50E1414DBFB; Tue, 27 Sep 2022 17:11:04 -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-smtp1.pobox.com (Postfix) with ESMTPSA id 01E7114DBFA; Tue, 27 Sep 2022 17:11:02 -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, #08; Tue, 27) X-master-at: bcd6bc478adc4951d57ec597c44b12ee74bc88fb X-next-at: b617e1fe3a04e74d5031ffb5a8390a362c0582ef Date: Tue, 27 Sep 2022 14:11:01 -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: E4AE6F54-3EA8-11ED-8900-2AEEC5D8090B-77302942!pb-smtp1.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. The -rc2 has been tagged for this cycle. People are free to discuss topics that has no relevance to the upcoming release, but we would appreciate if they instead concentrated on finding and fixing recent regressions in the upcoming release. Even though I may be replacing topics in 'seen' with their new iterations, I may not be picking up patches on new topics to 'seen', until the final around the beginning of the next month (cf. https://tinyurl.com/gitCal). These patches are welcome to come back in a more polished form after that happens (read: discussions on them are not forbidden. just allow me to leave my tree less distracted by new topics). 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'] * ds/bitmap-lookup-remove-tracing (2022-09-26) 1 commit (merged to 'next' on 2022-09-26 at a0d94b95e0) + pack-bitmap: remove trace2 region from hot path Perf-fix. source: -------------------------------------------------- [New Topics] * rj/ref-filter-get-head-description-leakfix (2022-09-26) 1 commit - ref-filter.c: fix a leak in get_head_description Leakfix. Will merge to 'next'? source: <6ff29e96-7f8d-c354-dced-b1b363e54467@gmail.com> -------------------------------------------------- [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] * ds/scalar-unregister-idempotent (2022-09-27) 4 commits - string-list: document iterator behavior on NULL input - gc: replace config subprocesses with API calls - scalar: make 'unregister' idempotent - maintenance: add 'unregister --force' "git maintenance unregister" in a repository that is already been unregistered reported an error. Will merge to 'next'. source: * jk/clone-allow-bare-and-o-together (2022-09-22) 1 commit (merged to 'next' on 2022-09-27 at 1feca721ac) + clone: allow "--bare" with "-o" "git clone" did not like to see the "--bare" and the "--origin" options used together without a good reason. Will cook in 'next'. source: * jk/fsck-on-diet (2022-09-22) 3 commits (merged to 'next' on 2022-09-27 at c2e93082a1) + parse_object_buffer(): respect save_commit_buffer + fsck: turn off save_commit_buffer + fsck: free tree buffers after walking unreachable objects "git fsck" failed to release contents of tree objects already used from the memory, which has been fixed. Will cook in 'next'. source: * jk/remote-rename-without-fetch-refspec (2022-09-22) 1 commit (merged to 'next' on 2022-09-27 at 165fe0a832) + remote: handle rename of remote without fetch refspec "git remote rename" failed to rename a remote without fetch refspec, which has been corrected. Will cook in 'next'. source: * js/merge-ort-in-read-only-repo (2022-09-26) 2 commits - merge-ort: return early when failing to write a blob - merge-ort: fix segmentation fault in read-only repositories In read-only repositories, "git merge-tree" tried to come up with a merge result tree object, which it failed (which is not wrong) and led to a segfault (which is bad), which has been corrected. Expecting a reroll. cf. The proposed log message for the second step may need updating. source: * mc/cred-helper-ignore-unknown (2022-09-22) 3 commits (merged to 'next' on 2022-09-27 at ce6e3616aa) + osxkeychain: clarify that we ignore unknown lines + netrc: ignore unknown lines (do not die) + wincred: ignore unknown lines (do not die) Most credential helpers ignored unknown entries in a credential description, but a few died upon seeing them. The latter were taught to ignore them, too Will cook in 'next'. source: * es/retire-efgrep (2022-09-23) 2 commits (merged to 'next' on 2022-09-27 at 344fdd138e) + check-non-portable-shell: detect obsolescent egrep/fgrep + Merge branch 'dd/retire-efgrep' into es/retire-efgrep (this branch uses dd/retire-efgrep.) Prepare for GNU [ef]grep that throw warning of their uses. Will cook in 'next'. source: * cw/submodule-status-in-parallel (2022-09-23) 4 commits - diff-lib: parallelize run_diff_files for submodules - diff-lib: refactor functions - submodule: move status parsing into function - run-command: add pipe_output to run_processes_parallel Allow the internal "diff-files" engine to run "how has this submodule changed?" in parallel to speed up "git status". Breaks its self check. cf. https://github.com/git/git/actions/runs/3115673002/jobs/5052804463 source: <20220922232947.631309-1-calvinwan@google.com> * vd/fix-unaligned-read-index-v4 (2022-09-23) 1 commit - read-cache: avoid misaligned reads in index v4 The codepath that reads from the index v4 had unaligned memory accesses, which has been corrected. Expecting a reroll. cf. cf. source: * dd/retire-efgrep (2022-09-21) 4 commits (merged to 'next' on 2022-09-21 at 22bc339be1) + t: convert fgrep usage to "grep -F" + t: convert egrep usage to "grep -E" + t: remove \{m,n\} from BRE grep usage + CodingGuidelines: allow grep -E (this branch is used by es/retire-efgrep.) Prepare for GNU [ef]grep that throw warning of their uses. Will cook in 'next'. source: * tb/midx-repack-ignore-cruft-packs (2022-09-21) 7 commits - midx.c: avoid cruft packs with non-zero `repack --batch-size` - midx.c: remove unnecessary loop condition - midx.c: replace `xcalloc()` with `CALLOC_ARRAY()` - midx.c: avoid cruft packs with `repack --batch-size=0` - midx.c: prevent `expire` from removing the cruft pack - Documentation/git-multi-pack-index.txt: clarify expire behavior - Documentation/git-multi-pack-index.txt: fix typo "git multi-pack-index repack/expire" used to repack unreachable cruft into a new pack, which have been corrected. Will merge to 'next'? cf. <63a1c3d4-eff3-af10-4263-058c88e74594@github.com> source: * ah/fsmonitor-daemon-usage-non-l10n (2022-09-21) 1 commit (merged to 'next' on 2022-09-21 at bc69a73c6c) + fsmonitor--daemon: don't translate literal commands Fix messages incorrectly marked for translation. Will cook in 'next'. source: <20220920050709.326359-1-alexhenrie24@gmail.com> * so/diff-merges-cleanup (2022-09-16) 3 commits (merged to 'next' on 2022-09-22 at 57694bbed7) + diff-merges: clarify log.diffMerges documentation + diff-merges: cleanup set_diff_merges() + diff-merges: cleanup func_by_opt() Code clean-up. Will cook in 'next'. source: <20220914193102.5275-1-sorganov@gmail.com> * ja/rebase-i-avoid-amending-self (2022-09-26) 1 commit - sequencer: avoid dropping fixup commit that targets self via commit-ish "git rebase -i" can mistakenly attempt to apply a fixup to a commit itself, which has been corrected. Will merge to 'next'? source: <20220924222904.1784975-1-aclopte@gmail.com> * ac/fuzzers (2022-09-19) 1 commit - fuzz: reorganise the path for existing oss-fuzz fuzzers Source file shuffling. Will merge to 'next'? source: * hn/parse-worktree-ref (2022-09-19) 1 commit - refs: unify parse_worktree_ref() and ref_type() Code and semantics cleaning. Will merge to 'next'? source: * ed/fsmonitor-on-networked-macos (2022-09-25) 6 commits - fsmonitor: add documentation for allowRemote and socketDir options - fsmonitor: check for compatability before communicating with fsmonitor - 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. Will merge to 'next'? 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: * jc/environ-docs (2022-09-16) 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. Will merge to 'next'? 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: * 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 "[