From nobody Wed Jul 29 18:27:58 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4h9LRg0ZC0z6mdqC for ; Wed, 29 Jul 2026 18:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h9LRf4rnSz3Jg3 for ; Wed, 29 Jul 2026 18:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785349678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5OMskmt/t3dfPLEjNZOLzw90tGCJWKYqdTJWc379ru0=; b=DlCjf/rlIo2aVVAtCta7ylPUWRRQ1PwLz0bZUzrY4yHvNhF2nPIjsp7qrKCESZuDqty541 pzalO7Y0u+IdHITy9bX1t6xtLfzD0zVBNRsPbU6XS5UpD4/ZHoTgn3j+QHnGiVS1RZY/e0 WNjxeGemTwfakJvtsWuhtlFJso4k+87tbkiakjZDT00wLbQFkg8ffU8iwdoXXd+szTnrpq sz2H7ihvZSMboeOMKpAx8e0jH43eAch7on58OZGPPoI5YXMoUfHf6GdJmRWstArFf90v35 kay7xrfB3Wi7GbNvcyo6aHaq2AcGepZM+f1cap32PZlCVDzDxCozbOBB2QmQqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785349678; a=rsa-sha256; cv=none; b=q+/1h78DZrHRghnWKbPrlGiAEQxqlmRwAovnDwNPI0P+JpW/kKbWPXS7+NCKXVaDYvUCF4 1Wgx3MsDy0MeZTtNiF2pLuNGeWRZjUXbHLbAnKVaKZ2CnkHQC9YEkyNLaqG0qJlCl9cre3 IxjglV74Kb8UZMOK9jpjTBh+GQ/e7ywAJLe8cY2L8PeI1wabUJT0SNQGwbmeYiUKrHjyJn WAUkC8Grnnh1ZZePOMwoEn2+xQoQZx2Jq2ze1AHigA0Xe8Tzl4c329goulL4QNQoRPgjs4 nO7e6BtNoZPnkio5KetHuF9FbqhCv70HoxMMsod95E5+IQ0sG1mumzzIZMMRfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785349678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5OMskmt/t3dfPLEjNZOLzw90tGCJWKYqdTJWc379ru0=; b=HKwW+KhLjbPIMIX9m8CZxQELgFmQmcqmMSxVe9pWBqVVJLof0+ljh9DSQNtCAnGSUHQJeU iqPzFh9GZzf530pG2MhAy4AnPJcOEpPRBsd/N+4nOQcDrzg3VKpdBGSkDmgjHUX++gNNwS MV469EDdytZvrbL7jc1GGkffPo6MkSjswS+dtj8DVj5v3ejj/oyxpDBkEjm3z/Olk1nlo9 8zgZVKlX2dfp0wx8e9X+ABWYQnr3famptdI3a7L75lMzu7B3A/RyeCHcpaql6VUQLeG9Zc l0YggfNINnlL82ZKVZj6Cf780Qw0wyEstdeL0ANP/EmdEga9J3KEsvg9OwHPHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h9LRf3Z9VzdTf for ; Wed, 29 Jul 2026 18:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cfc9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Jul 2026 18:27:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b9ea73ceb35c - main - git-arc: Make git arc patch -r smarter List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9ea73ceb35c54f46be558493537743784797f4d Auto-Submitted: auto-generated Date: Wed, 29 Jul 2026 18:27:58 +0000 Message-Id: <6a6a462e.3cfc9.1b0ff97d@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b9ea73ceb35c54f46be558493537743784797f4d commit b9ea73ceb35c54f46be558493537743784797f4d Author: Mark Johnston AuthorDate: 2026-07-29 18:22:29 +0000 Commit: Mark Johnston CommitDate: 2026-07-29 18:22:29 +0000 git-arc: Make git arc patch -r smarter - Make it work even when git arc isn't run from the root of the repo. - If the patch fails to apply, let git partially apply the patch and generate rej files for inspection. While here, remove the return value from apply_rev(), it's never actually used. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D58532 --- tools/tools/git/git-arc.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index f2a325f3452a..72605d49d40f 100755 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -609,14 +609,15 @@ apply_rev() parents=$(diff2parents "$rev") for parent in $parents; do echo "Applying parent ${parent}..." - if ! apply_rev $parent $commit $raw $stack; then - return 1 - fi + apply_rev $parent $commit $raw $stack done fi + # If a patch fails to apply, the corresponding command below will exit + # with a non-zero status and terminate the script. if $raw; then - fetch -o /dev/stdout "https://reviews.freebsd.org/${rev}.diff" | git apply --index + fetch -o /dev/stdout "https://reviews.freebsd.org/${rev}.diff" | \ + git -C "$(git rev-parse --show-toplevel)" apply --index --reject else arc patch --skip-dependencies --nobranch --nocommit --force $rev fi @@ -624,7 +625,6 @@ apply_rev() if ${commit}; then patch_commit $rev fi - return 0 } gitarc__patch()