From nobody Wed Aug 24 20:54:54 2022 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 4MCddV5WXDz4Zqnr; Wed, 24 Aug 2022 20:54:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MCddV4fjpz3ZcP; Wed, 24 Aug 2022 20:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661374494; 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=rEpalRLKOHLNRNssaNc6bFB0gj4vjXMtpDlNZLMr1/k=; b=b1m7YzbpTvJRS1HVAzosNl8gPjCinCWZkEeMYMr2xpnxTcXnOEoPPj2gT9ib+43WgzzZQ8 HRY8tdzJpQ+BKQS3DuWiVjWjw6UOmK8uH3r2Caw/7xPROaA5T54Pk8NAPO6Ps53REtLQOk CmeXoWAnjzsC1or0j3p3nJ9RCM5kmf/QY4FMmsVQfCBiKv2zm5/0tDcI4073tuQAq7mUZk j9EgAgqYu5mXHbWkpgDxlNv6Xs1hb14Bgba47mnl9fmKT0gB22L/vF1fHRTXUT+/bmNEwe 28PJTYMdv54FuRr/fTUR7RpF8gCLOBabHxyn+e5HFe78vBgrDzuHZsG8bc0Hag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MCddV3XvQzNMK; Wed, 24 Aug 2022 20:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27OKsseg095670; Wed, 24 Aug 2022 20:54:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27OKss1E095669; Wed, 24 Aug 2022 20:54:54 GMT (envelope-from git) Date: Wed, 24 Aug 2022 20:54:54 GMT Message-Id: <202208242054.27OKss1E095669@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c4d06691c04c - main - git-arc: Respect GIT_EDITOR and GIT_PAGER 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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: c4d06691c04c569e163b771b99734bfcadac39fd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661374494; 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=rEpalRLKOHLNRNssaNc6bFB0gj4vjXMtpDlNZLMr1/k=; b=NH35jt6Y3Tc1ZZFamFDsF3myLhu94WfRB6x5NsSzP+COTgR7/+35euZcQhWfPkPKou5G7u m6ZPQqfjEerZAxcxbvLsCHUQKmco2fLdx8Oc2qY5FP9QJ43kTt30Z4cIXrH1lT2aHOTsRb IvrTh5rtpZfyZcKc9Ls/cG0gGzVqsFJniJu410ii2gWenAuwk4gF1NqT26zmeNB4FYmXzv wOcmEuCzwQHXcF/NLUVDEwZnQu6JZkqmWDFoMMa4lQwjqYqMJHM/gj39tyVdPmQV7XKK27 MMdJA5eAiWH4a7ezFDG/sheUBAkn2wH3EiTkNhB0UeWX5mZHGsnPlCQ4COArZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661374494; a=rsa-sha256; cv=none; b=D1sPSW8Bcr9PWh2eY0r+j1CHppFmk83/Ghq6HtHeEPmbcMDOgjBM4fOxeDNsN710vHMSkc f4BsWUAB/EF/DwS46ZBULZRZ3xHjzO706v2YeYqsZuOE1gnifkN0JTbaYXDWt7kR6aBG8v aIUZZwzeHuiXyZn+g7zDcLBP9c0Kk8OvbqH65bMHeV3JNmhrsdipl0ILjDjr/R6/U6+eGc FJyN5WQXzYIx95obUHiQRn4WZCQyvdaaugSrMOXUyGw18Jt44V+rWvlt0oSsiQCeyjuCZ7 FzbM+Yc6bps6mEwVw/xnPWwdbrXeSmN21wfpJe1/++VR1CRM/nt92NRAG4KMbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c4d06691c04c569e163b771b99734bfcadac39fd commit c4d06691c04c569e163b771b99734bfcadac39fd Author: Mark Johnston AuthorDate: 2022-08-24 19:59:47 +0000 Commit: Mark Johnston CommitDate: 2022-08-24 20:54:41 +0000 git-arc: Respect GIT_EDITOR and GIT_PAGER --- tools/tools/git/git-arc.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index ab12b887c89d..22a13aa307bd 100644 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -575,6 +575,16 @@ USAGE= # shellcheck disable=SC1090 . "$git_sh_setup" +# git commands use GIT_EDITOR instead of EDITOR, so try to provide consistent +# behaviour. Ditto for PAGER. This makes git-arc play nicer with editor +# plugins like vim-fugitive. +if [ -n "$GIT_EDITOR" ]; then + EDITOR=$GIT_EDITOR +fi +if [ -n "$GIT_PAGER" ]; then + PAGER=$GIT_PAGER +fi + # Bail if the working tree is unclean, except for "list" and "patch" # operations. case $verb in