From nobody Thu Nov 27 18:07:35 2025 X-Original-To: dev-commits-src-all@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 4dHPXs1bHYz6Hmfb for ; Thu, 27 Nov 2025 18:07:41 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dHPXl70pTz4Plb for ; Thu, 27 Nov 2025 18:07:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764266856; 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=9lFvY51gmG0ODYPSZW356EZnUPS3QQTUBVvCITjTOr4=; b=CDSpP0HghMi0RQL2e8k0B3w0Hmy1TTi8ebs9pbYWrhEtyX/AF6SJBj123NGQQV34b3FSqO 0qB7JJ6MOD/PmqFu27JS34BXNzQV/WFunh5vdg3wmCZKmhm9w3UWlLoKZz60vTzmzRvkDS wkDL6Ni+g0cAOJA5Qs0HPdn6AVoOWML98BtDMjf8tIQOIuriLKO0vbehKdihp5JS7KGFOJ 54r8sGreh6zA3zXqSdEumQ7cez5jHcGtehcr+yAizbvrksgyqgPx5oM/ddT29oLDkEipPe ex5DX30XoNZZvx3DGchnyBnA8hLwDaal7LE7YHOTKp6eTE/YLdypNtNHDojDig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764266856; 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=9lFvY51gmG0ODYPSZW356EZnUPS3QQTUBVvCITjTOr4=; b=gZBzaum+qOZ7uA0tTY8JHaYHLnEW3dUtkxAZpkHFVa2mhKOHBxzzLNy163lgusFiK/yVoh Sy7Th99pOnsnZRIGVnXSZUdCfhzIILDC6wVKLm2O9UXaeBl/WUBGpDZaazJUV7ARK67N+Z ODi3+PUggSCZUuDuHCbJgtJgBrt/Ac/j/tG205krfAkIHTC4/5ThMy30By/tE8a8uo8zCM whohpjY7u43VffEyhJs8fb6fd8onoafeGtD6O6BgxAWJd5iFhVG0bggMBDXFJwoiI1HDiP HnnFIw/OEH7YztgXkDogbU7Ut4oCEHznmDeCuo0nocXWWDqjYq4BKgh1iGZE5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764266856; a=rsa-sha256; cv=none; b=jaoekgvYp9VnS/2ZuVWyINoVL5w4ArKF3HkETU/JoUfSan8pcC0aCgl/KesTUlZXUFltXi I1pcF1ln1NFdusu2tHfoLqqztVkVd7Pw+W37NIgGHLgN2Ud6bMyKg6A4ezyHdR2+umCxmx VpYkoB/JW7QN2p88iSQsZbe3v9oIPlKsbE/Y6J+Zz2bdHnFdBP/SgrB3zxMRZcOFU/F99k /VOS71PMXmC2r134jRaIj/X9f8cvcSQIWJ7FrRonjHmJAqNrkNYFES+MPhFino3Fmh2Ke/ MQU7KSumDMu9lBZZ28LcdmP06i6+egXf4DqbMrdzHAxY+t4hFSSIGK9pNPU7+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dHPXl5zcMzBpC for ; Thu, 27 Nov 2025 18:07:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a7f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 27 Nov 2025 18:07:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b3e53f9fff11 - main - git-arc: Don't require devel/arcanist List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3e53f9fff11e2e6289f5c69ad08f5acd727abd6 Auto-Submitted: auto-generated Date: Thu, 27 Nov 2025 18:07:35 +0000 Message-Id: <69289367.a7f0.52d52c35@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b3e53f9fff11e2e6289f5c69ad08f5acd727abd6 commit b3e53f9fff11e2e6289f5c69ad08f5acd727abd6 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-27 18:07:15 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-27 18:07:15 +0000 git-arc: Don't require devel/arcanist Instead of invoking just “arc”, which requires devel/arcanist, which conflicts with archivers/arc, invoke the underlying script installed by devel/arcanist-lib. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53942 --- tools/tools/git/git-arc.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index fa618cdcbc22..f33a73334799 100644 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -171,6 +171,20 @@ get_bool_config() test "$(git config --bool --get $1 2>/dev/null || echo $2)" != "false" } +# +# Invoke the actual arc command. This allows us to only rely on the +# devel/arcanist-lib port, which installs the actual script, rather than +# the devel/arcanist-port, which installs a symlink in ${LOCALBASE}/bin +# but conflicts with the archivers/arc port. +# +: ${LOCALBASE:=$(sysctl -n user.localbase)} +: ${LOCALBASE:=/usr/local} +: ${ARC_CMD:=${LOCALBASE}/lib/php/arcanist/bin/arc} +arc() +{ + ${ARC_CMD} "$@" +} + # # Filter the output of call-conduit to remove the warnings that are generated # for some installations where openssl module is mysteriously installed twice so