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 A21B5C4332F for ; Mon, 3 Oct 2022 17:27:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229779AbiJCR07 (ORCPT ); Mon, 3 Oct 2022 13:26:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229792AbiJCR0s (ORCPT ); Mon, 3 Oct 2022 13:26:48 -0400 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B84FB193DF for ; Mon, 3 Oct 2022 10:26:46 -0700 (PDT) Received: by mail-pj1-x1029.google.com with SMTP id l12so10289271pjh.2 for ; Mon, 03 Oct 2022 10:26:46 -0700 (PDT) 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=LMJ48SarayvWXKxCTn1kLNLAw3zbTIzlgWln0WORcTE=; b=lvk07pzhr6cVn/e9ctBKXh6vwE6sjuD5x9egjYn6Pt8qYYOW/W5C+xTwdJvk0ONBe6 S+dG08B2Qc1AKDKqn9E1/GtQW5Ubs9Yluid1ysGN+9fzxOqy6mmgGpABTZtaIRSKsBJW G7bPh8LBrhHx8rhjosWPGdklgtbrjjLfkcza6SCWQGJlLK8RBj1W6xvXgFHdBE6SxlWs NA8lmN4dM656oO3kcFjZvqALGwlhiMFCHeUqm9ohisAjupJ2X/mBlLVqbHyt5SD9A0QR ZOPlzzrBTTZIR2MXuJYhNhX18qyKvjlgT/peF4zW8zlZjFufEo9/bsCAQm3u9TZhoBWf rbWg== 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=LMJ48SarayvWXKxCTn1kLNLAw3zbTIzlgWln0WORcTE=; b=jZGwTwbUiW5QU5V7epg2PXJjfPqUFvJ31BHIvqtHcw7oZLoye0K/32dG/Aw5pNGsq0 rKLHva9KMl54041IQP0Hx4352v4zjPoxgLN7UxkJEqWlWQhDdRzIKtc4d9ACubJaRIe9 2jJWh4zZb2LYXe+m7KSd1/L8nRnMcG7m47zdXcIrQJ+pmGX46Ae/390HSAQ5Klhw85vQ 6wgcQ7GQ5cwvKFc/LeDI89EPE5XPzhm7zCFE6Hn11u53AlTFwTqC6fRed8l1B9NZ0tAb dIqNBsHXUEuynFnRCisZ6bg0OGwhR9hXl6vVubiFejYRFj59I5u+fDWmTpmVD7P5O7i5 Cldw== X-Gm-Message-State: ACrzQf0dVR+K30ot1zHWNY/gV2PLzzSCxluYNA4TAPQPO2+O5pUFjPcA OF9BtpRY1pM8vnjGjgBs1DefkBT5tWo= X-Google-Smtp-Source: AMsMyM6Y8tt8GgvTxQyg5t7GdnDQv279UryDK8QkS7VYv/6hi3bRBZNNwB3wEgujo4YUuiI3y7TBEA== X-Received: by 2002:a17:90b:3a90:b0:202:d341:bf81 with SMTP id om16-20020a17090b3a9000b00202d341bf81mr13169140pjb.179.1664818005257; Mon, 03 Oct 2022 10:26:45 -0700 (PDT) Received: from localhost (33.5.83.34.bc.googleusercontent.com. [34.83.5.33]) by smtp.gmail.com with ESMTPSA id jn15-20020a170903050f00b00178650510f9sm7496669plb.160.2022.10.03.10.26.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 10:26:44 -0700 (PDT) Sender: Junio C Hamano From: Junio C Hamano To: git@vger.kernel.org Subject: What's cooking in git.git (Oct 2022, #01; Mon, 3) X-master-at: 3dcec76d9df911ed8321007b1d197c1a206dc164 X-next-at: 74048e4d9e2b6a27a4fab355a907e0c38d172bfd Date: Mon, 03 Oct 2022 10:26:44 -0700 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. Git 2.38 has been tagged. There are many topics that have been cooking in 'next' and should be ready to graduate, but let's first see if any brown paper bag regressions are reported, which may require a quick maintenance track update, before merging them down. The cycle toward 2.39 will start after that for real. With holidays near the end of November in some parts of the world and of December in many parts of the world, traditionally cycles in Q4 have been short ones. The 2.39 cycle is planned to last 9 weeks, and I will go offline at around week #4 for a few weeks, during which an interim maintainer will take over the daily operation of the project, until I come back and receive the baton again. Consider it a bus-factor preparedness exercise. 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] * jc/tmp-objdir (2022-09-30) 1 commit - tmp-objdir: skip clean up when handling a signal The code to clean temporary object directories (used for quarantine) tried to remove them inside its signal handler, which was a no-no. Will merge to 'next'? source: -------------------------------------------------- [Stalled] * 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> * 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. Under SANITIZE=address, t1006-cat-file.sh finds a breakage. cf. <20220728230210.2952731-1-calvinwan@google.com> cf. source: <20220728230210.2952731-1-calvinwan@google.com> -------------------------------------------------- [Cooking] * jc/branch-description-unset (2022-09-30) 1 commit - branch: do not fail a no-op --edit-desc "GIT_EDITOR=: git branch --edit-description" resulted in failure, which has been corrected. Will merge to 'next'? source: * rj/branch-edit-desc-unborn (2022-09-30) 1 commit - branch: description for non-existent branch errors "git branch --edit-description" on an unborh branch misleadingly said that no such branch exists, which has been corrected. Will merge to 'next'? source: <930ff836-a5c4-0e85-517d-39645f00cd31@gmail.com> * ab/test-malloc-with-sanitize-leak (2022-09-29) 1 commit (merged to 'next' on 2022-09-29 at b6fef2dd1f) + test-lib: have SANITIZE=leak imply TEST_NO_MALLOC_CHECK Test fix. Will cook in 'next'. source: * ah/branch-autosetupmerge-grammofix (2022-09-28) 1 commit (merged to 'next' on 2022-09-29 at 622b75f0da) + push: improve grammar of branch.autoSetupMerge advice Fix grammar of a message introduced in previous round. Will cook in 'next'. source: <20220928055811.777227-1-alexhenrie24@gmail.com> * jt/promisor-remote-fetch-tweak (2022-09-29) 2 commits - promisor-remote: die upon failing fetch - promisor-remote: remove a return value Remove error detection from a function that fetches from promisor remotes, and make it die when such a fetch fails to bring all the requested objects, to give an early failure to various operations. Needs review. source: * rj/ref-filter-get-head-description-leakfix (2022-09-26) 1 commit (merged to 'next' on 2022-09-29 at d05d052eb1) + ref-filter.c: fix a leak in get_head_description Leakfix. Will cook in 'next'. source: <6ff29e96-7f8d-c354-dced-b1b363e54467@gmail.com> * ds/scalar-unregister-idempotent (2022-09-27) 4 commits (merged to 'next' on 2022-09-28 at a09a78d861) + 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 cook in '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-28) 2 commits (merged to 'next' on 2022-09-29 at 84df46c1b4) + 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. Will cook in 'next'. 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: * vd/fix-unaligned-read-index-v4 (2022-09-28) 1 commit (merged to 'next' on 2022-09-28 at 5b3425fd58) + read-cache: avoid misaligned reads in index v4 The codepath that reads from the index v4 had unaligned memory accesses, which has been corrected. Will cook in 'next'. 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 (merged to 'next' on 2022-09-29 at 55474c6ecc) + 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 cook in '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 (merged to 'next' on 2022-09-29 at 2635f37dae) + 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 cook in 'next'. source: <20220924222904.1784975-1-aclopte@gmail.com> * ac/fuzzers (2022-09-19) 1 commit (merged to 'next' on 2022-09-29 at 600f45a53b) + fuzz: reorganise the path for existing oss-fuzz fuzzers Source file shuffling. Will cook in 'next'. source: * hn/parse-worktree-ref (2022-09-19) 1 commit (merged to 'next' on 2022-09-29 at 1f4453eb83) + refs: unify parse_worktree_ref() and ref_type() Code and semantics cleaning. Will cook in 'next'. source: * ed/fsmonitor-on-networked-macos (2022-09-28) 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) Extending credential helper protocol. Expecting a reroll. A separate non-RFC submission of the first three is expected. cf. source: * jc/environ-docs (2022-09-16) 5 commits (merged to 'next' on 2022-09-29 at a0a43b8de5) + 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 cook in 'next'. source: <20220915160659.126441-1-gitster@pobox.com> * rs/diff-caret-bang-with-parents (2022-10-01) 3 commits - diff: support ^! for merges - revisions.txt: unspecify order of resolved parts of ^! - 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: <16c49d20-cafc-4b48-3c6b-e11c74c29abb@web.de> * ab/doc-synopsis-and-cmd-usage (2022-09-30) 36 commits - tests: assert consistent whitespace in -h output - 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 "[