From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pb-smtp20.pobox.com (pb-smtp20.pobox.com [173.228.157.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E64B11CA1 for ; Tue, 19 Mar 2024 16:53:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=173.228.157.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710867194; cv=none; b=mxc6qCwmFNj0mZB/SXhG0b4T8de6BJWrNNObI7N20ZPQ3CptPwZ0jYUiKu29FSUYKY3jBzWPOau3KlC4YRo2D8ahBQJnLZ0a+sOz/EwtnY5niwnYSNW9Flbb9ozEyTxG3ubI232Rf5WnJW6RFszdF3j4qxbWxOa8sI6yjFYJ/B8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710867194; c=relaxed/simple; bh=VSvc8VLPTY1wVik0JeP5TOoWs26keA0tqHjK1ze1xpM=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=CccwZIQb7P31lVaopYBjTERNWhXt0t0DFqjjjqYqDy2QzExv7UKvJGaWUVDtngd44lbpXS75hscChQl7rxGJyT64MiaZUT4BgRj8TYL0MH5kU8ntyIUElFcp0+6Z3AZFbEYxoZjPda4+tE4IpL4Otybqyc3vqTh8Lt0ndX+Umu0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com; spf=pass smtp.mailfrom=pobox.com; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b=k2+NBnJ5; arc=none smtp.client-ip=173.228.157.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pobox.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b="k2+NBnJ5" Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 5AECE27DD9; Tue, 19 Mar 2024 12:53:05 -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=V Svc8VLPTY1wVik0JeP5TOoWs26keA0tqHjK1ze1xpM=; b=k2+NBnJ5jNzbHsq4w 4i48RIoBt9xSC5eyt8Ceicd7fUGXneVFiz+/oIF99cU1727mvIUa25ZD7R3+QzBp 7oruO+Dci4VJOPZDipn3QcdGqRO6K1E2hrhTnyg5UogY0B43HQq22K6iYtzbxaT5 elKCm57LWfvyJU4xgI4ysnvraU= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 4BBAF27DD8; Tue, 19 Mar 2024 12:53:05 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.125.139.61]) (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 AA20C27DD6; Tue, 19 Mar 2024 12:53:01 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: git@vger.kernel.org Subject: What's cooking in git.git (Mar 2024, #05; Tue, 19) X-master-at: 3bd955d26919e149552f34aacf8a4e6368c26cec X-next-at: fe251e3e4dec6a6d677e61d53b316c06da172af2 Date: Tue, 19 Mar 2024 09:53:00 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 25BE0A8E-E611-11EE-B7E9-F515D2CDFF5E-77302942!pb-smtp20.pobox.com 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 and may be annotated with an URL to a message that raises issues but they are no means exhaustive. A topic without enough support may be discarded after a long period of no activity (of course they can be resubmit when new interests arise). 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'] * jh/trace2-missing-def-param-fix (2024-03-07) 3 commits (merged to 'next' on 2024-03-08 at a797cfea3c) + trace2: emit 'def_param' set with 'cmd_name' event + trace2: avoid emitting 'def_param' set more than once + t0211: demonstrate missing 'def_param' events for certain commands Some trace2 events that lacked def_param have learned to show it, enriching the output. Reviewed-by: Josh Steadmon cf. source: * jk/doc-remote-helpers-markup-fix (2024-03-07) 1 commit (merged to 'next' on 2024-03-08 at 2cded1c696) + doc/gitremote-helpers: fix missing single-quote Doc mark-up fix. source: <20240307084313.GA2072022@coredump.intra.peff.net> * pw/rebase-i-ignore-cherry-pick-help-environment (2024-02-27) 1 commit (merged to 'next' on 2024-03-08 at e806ee9493) + rebase -i: stop setting GIT_CHERRY_PICK_HELP Code simplification by getting rid of code that sets an environment variable that is no longer used. source: -------------------------------------------------- [New Topics] * bb/sh-scripts-cleanup (2024-03-16) 22 commits (merged to 'next' on 2024-03-18 at 4501a04796) + git-quiltimport: avoid an unnecessary subshell + contrib/coverage-diff: avoid redundant pipelines + t/t9*: merge "grep | sed" pipelines + t/t8*: merge "grep | sed" pipelines + t/t5*: merge a "grep | sed" pipeline + t/t4*: merge a "grep | sed" pipeline + t/t3*: merge a "grep | awk" pipeline + t/t1*: merge a "grep | sed" pipeline + t/t9*: avoid redundant uses of cat + t/t8*: avoid redundant use of cat + t/t7*: avoid redundant use of cat + t/t6*: avoid redundant uses of cat + t/t5*: avoid redundant uses of cat + t/t4*: avoid redundant uses of cat + t/t3*: avoid redundant uses of cat + t/t1*: avoid redundant uses of cat + t/t0*: avoid redundant uses of cat + t/perf: avoid redundant use of cat + t/annotate-tests.sh: avoid redundant use of cat + t/lib-cvs.sh: avoid redundant use of cat + contrib/subtree/t: avoid redundant use of cat + doc: avoid redundant use of cat Shell scripts clean-up. Will merge to 'master'. source: <20240315194620.10713-1-dev+git@drbeat.li> * bl/doc-config-fixes (2024-03-16) 2 commits (merged to 'next' on 2024-03-18 at a9038d5a9e) + docs: fix typo in git-config `--default` + docs: clarify file options in git-config `--edit` A few typoes in "git config --help" have been corrected. Will merge to 'master'. source: <20240316050149.1182867-2-brianmlyles@gmail.com> * bl/doc-key-val-sep-fix (2024-03-18) 2 commits (merged to 'next' on 2024-03-18 at b2e1babb85) + docs: adjust trailer `separator` and `key_value_separator` language + docs: correct trailer `key_value_separator` description The documentation for "%(trailers[:options])" placeholder in the "--pretty" option of commands in the "git log" family has been updated. Will merge to 'master'. source: <20240316035612.752910-1-brianmlyles@gmail.com> * ja/doc-formatting-fix (2024-03-16) 2 commits (merged to 'next' on 2024-03-18 at edde7a576d) + doc: fix some placeholders formating + doc: format alternatives in synopsis Documentation mark-up fix. Will merge to 'master'. source: * la/hide-trailer-info (2024-03-16) 7 commits - trailer: retire trailer_info_get() from API - trailer: make trailer_info struct private - trailer: make parse_trailers() return trailer_info pointer - interpret-trailers: access trailer_info with new helpers - sequencer: use the trailer iterator - trailer: teach iterator about non-trailer lines - Merge branch 'la/format-trailer-info' into la/hide-trailer-info (this branch uses la/format-trailer-info.) The trailer API has been reshuffled a bit. source: * pb/advice-merge-conflict (2024-03-18) 2 commits - builtin/am: allow disabling conflict advice - sequencer: allow disabling conflict advice Hints that suggest what to do after resolving conflicts can now be squelched by disabling advice.mergeConflict. Will merge to 'next'? source: * rs/t-prio-queue-fixes (2024-03-18) 2 commits - t-prio-queue: check result array bounds - t-prio-queue: shorten array index message Test clean-up. Will merge to 'next'. source: <9bf36cc8-ff27-44df-b2fb-9f959c781269@web.de> * ps/pack-refs-auto (2024-03-18) 16 commits - builtin/gc: pack refs when using `git maintenance run --auto` - builtin/gc: forward git-gc(1)'s `--auto` flag when packing refs - t6500: extract objects with "17" prefix - builtin/gc: move `struct maintenance_run_opts` - builtin/pack-refs: introduce new "--auto" flag - builtin/pack-refs: release allocated memory - refs/reftable: expose auto compaction via new flag - refs: remove `PACK_REFS_ALL` flag - refs: move `struct pack_refs_opts` to where it's used - t/helper: drop pack-refs wrapper - refs/reftable: print errors on compaction failure - reftable/stack: gracefully handle failed auto-compaction due to locks - reftable/stack: use error codes when locking fails during compaction - reftable/error: discern locked/outdated errors - reftable/stack: fix error handling in `reftable_stack_init_addition()` - Merge branch 'ps/reftable-stack-tempfile' into ps/pack-refs-auto (this branch uses ps/reftable-stack-tempfile.) "git pack-refs" learned the "--auto" option, which is a useful addition to be triggered from "git gc --auto". Needs review. source: -------------------------------------------------- [Cooking] * bb/iso-strict-utc (2024-03-13) 1 commit (merged to 'next' on 2024-03-14 at d2ac616873) + date: make "iso-strict" conforming for the UTC timezone The output format for dates "iso-strict" has been tweaked to show a time in the Zulu timezone with "Z" suffix, instead of "+00:00". Will merge to 'master'. source: <20240313225423.11373-1-dev+git@drbeat.li> * dg/user-manual-hash-example (2024-03-12) 1 commit (merged to 'next' on 2024-03-14 at 767800d3a7) + Documentation/user-manual.txt: example for generating object hashes User manual (the original one) update. Will merge to 'master'. source: <20240312104238.4920-2-dirk@gouders.net> * jc/show-untracked-false (2024-03-13) 2 commits - status: allow --untracked=false and friends - status: unify parsing of --untracked= and status.showUntrackedFiles The status.showUntrackedFiles configuration variable had a name that tempts users to set a Boolean value expressed in our usual "false", "off", and "0", but it only took "no". This has been corrected so "true" and its synonyms are taken as "normal", while "false" and its synonyms are taken as "no". Will merge to 'next'? source: <20240313173214.962532-1-gitster@pobox.com> * js/bugreport-no-suffix-fix (2024-03-16) 1 commit (merged to 'next' on 2024-03-18 at 180db8ec38) + bugreport.c: fix a crash in `git bugreport` with `--no-suffix` option "git bugreport --no-suffix" was not supported and instead segfaulted, which has been corrected. Will merge to 'master'. source: <9c6f3f5203ae26c501a5711e2610573130bfd550.1710388817.git.gitgitgadget@gmail.com> * jw/doc-show-untracked-files-fix (2024-03-13) 1 commit (merged to 'next' on 2024-03-14 at 091f64ad6c) + doc: status.showUntrackedFiles does not take "false" The status.showUntrackedFiles configuration variable was incorrectly documented to accept "false", which has been corrected. Will merge to 'master'. source: * ph/diff-src-dst-prefix-config (2024-03-18) 2 commits - diff.*Prefix: use camelCase in the doc and test titles - diff: add diff.srcPrefix and diff.dstPrefix configuration variables "git diff" and friends learned two extra configuration variables. Will merge to 'next'. source: <20240315010310.GA1901653@quokka> source: * ps/clone-with-includeif-onbranch (2024-03-12) 1 commit - t5601: exercise clones with "includeIf.*.onbranch" An additional test to demonstrate something I am not sure what. Waiting for a review response. cf. source: <0bede59a53862585c49bc635f82e44e983144a7f.1710246859.git.ps@pks.im> * bb/t0006-negative-tz-offset (2024-03-14) 1 commit (merged to 'next' on 2024-03-14 at 3f4751b6b2) + t0006: add more tests with a negative TZ offset More tests on showing time with negative TZ offset. Will merge to 'master'. source: <20240314085512.1827031-1-dev+git@drbeat.li> * rj/restore-plug-leaks (2024-03-14) 1 commit (merged to 'next' on 2024-03-15 at ac10ae7892) + checkout: plug some leaks in git-restore Leaks from "git restore" have been plugged. Will merge to 'master'. source: <64c1c3cc-51d7-4168-9731-4389889e1449@gmail.com> * bt/fuzz-config-parse (2024-03-15) 1 commit - fuzz: add fuzzer for config parsing A new fuzz target that exercises config parsing code. Will merge to 'next'? source: * ds/doc-config-reflow (2024-03-14) 1 commit - config.txt: perform some minor reformatting Reflow a paragraph in the documentation source without any effect to the formatted text. Comments? source: <97bdaf075bf5a68554cca1731eca78aff2662907.1710444774.git.dsimic@manjaro.org> * jc/index-pack-fsck-levels (2024-03-15) 1 commit (merged to 'next' on 2024-03-18 at 243c5f4125) + t5300: fix test_with_bad_commit() Test fix. Will merge to 'master'. source: * la/format-trailer-info (2024-03-15) 5 commits - trailer: finish formatting unification - trailer: begin formatting unification - format_trailer_info(): append newline for non-trailer lines - format_trailer_info(): drop redundant unfold_value() - format_trailer_info(): use trailer_item objects (this branch is used by la/hide-trailer-info.) The code to format trailers have been cleaned up. Comments? source: * rs/config-comment (2024-03-15) 3 commits - config: allow tweaking whitespace between value and comment - config: fix --comment formatting - config: add --comment option to add a comment "git config" learned "--comment=" option to leave a comment immediately after the "variable = value" on the same line in the configuration file. Waiting for review response. cf. source: * jc/safe-implicit-bare (2024-03-11) 1 commit (merged to 'next' on 2024-03-14 at e8bdbed1a4) + setup: notice more types of implicit bare repositories Users with safe.bareRepository=explicit can still work from within $GIT_DIR of a seconary worktree (which resides at .git/worktrees/$name/) of the primary worktree without explicitly specifying the $GIT_DIR environment variable or the --git-dir= option. Will merge to 'master'. source: * pw/checkout-conflict-errorfix (2024-03-14) 5 commits - checkout: fix interaction between --conflict and --merge - checkout: cleanup --conflict=