From owner-dev-commits-src-all@freebsd.org Thu Mar 25 12:07:56 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C6F255BB814; Thu, 25 Mar 2021 12:07:56 +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 4F5kQ31j2Xz3F4J; Thu, 25 Mar 2021 12:07:54 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 CC8B826DC9; Thu, 25 Mar 2021 12:07:53 +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 12PC7reT018873; Thu, 25 Mar 2021 12:07:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12PC7rhi018872; Thu, 25 Mar 2021 12:07:53 GMT (envelope-from git) Date: Thu, 25 Mar 2021 12:07:53 GMT Message-Id: <202103251207.12PC7rhi018872@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: 142cb88bc68d - main - git-arc.sh: Make it compatible with Ubuntu 18.04 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 142cb88bc68d59e1993dc3364a673ae01cf6899b Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Mar 2021 12:07:56 -0000 The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=142cb88bc68d59e1993dc3364a673ae01cf6899b commit 142cb88bc68d59e1993dc3364a673ae01cf6899b Author: Alex Richardson AuthorDate: 2021-03-25 11:17:56 +0000 Commit: Alex Richardson CommitDate: 2021-03-25 11:17:58 +0000 git-arc.sh: Make it compatible with Ubuntu 18.04 dash does not allow function names containing a ":", so replace it with a '_'. Additionally, Ubunutu 18.04 ships git 2.17 which does not support the `--default false` flag for git config. Reviewed By: markj Differential Revision: https://reviews.freebsd.org/D29374 --- tools/tools/git/git-arc.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index 53bf462eff18..82a549e0868f 100644 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -350,12 +350,12 @@ build_commit_list() echo "$commits" } -gitarc::create() +gitarc__create() { local commit commits doprompt list o prev reviewers subscribers list= - if [ "$(git config --bool --default false --get arc.list)" != "false" ]; then + if [ "$(git config --bool --get arc.list 2>/dev/null || echo false)" != "false" ]; then list=1 fi doprompt=1 @@ -402,7 +402,7 @@ gitarc::create() restore_head } -gitarc::list() +gitarc__list() { local chash commit commits diff title @@ -435,7 +435,7 @@ gitarc::list() done } -gitarc::patch() +gitarc__patch() { local rev @@ -450,7 +450,7 @@ gitarc::patch() done } -gitarc::stage() +gitarc__stage() { local author branch commit commits diff reviewers tmp @@ -498,7 +498,7 @@ gitarc::stage() done } -gitarc::update() +gitarc__update() { local commit commits diff @@ -524,7 +524,7 @@ gitarc::update() set -e ASSUME_YES= -if [ "$(git config --bool --default false --get arc.assume-yes)" != "false" ]; then +if [ "$(git config --bool --get arc.assume-yes 2>/dev/null || echo false)" != "false" ]; then ASSUME_YES=1 fi @@ -588,10 +588,10 @@ list|patch) ;; esac -if [ "$(git config --bool --default false --get arc.browse)" != "false" ]; then +if [ "$(git config --bool --get arc.browse 2>/dev/null || echo false)" != "false" ]; then BROWSE=--browse fi trap restore_head EXIT INT -gitarc::"${verb}" "$@" +gitarc__"${verb}" "$@"