From nobody Tue Oct 04 17:06:20 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 4Mhkcs03cdz4fGjG; Tue, 4 Oct 2022 17:06:21 +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 4Mhkcr6W8Xz4D66; Tue, 4 Oct 2022 17:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664903180; 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=PP8dz25eCJviu0QsWn8YuWCMXkRNNQgBdAnYhY8unpM=; b=uncczgsnwv8a/O0zl4oOxlUgAcxmk88aTBYdbmEhRHpbaCHeyucjV7PW3/TlH6Zv4/tjka N2nT2v7ay01wwfU23sAvtiGWws9KrnpH4sJUyonXH++MWbwBfG+glgPhhpH6ZF8lLSJEEw y8YEMaCAJilRfL/g/7pJPyFHiYld9E6PqZUQ62BKK2Y4lBZMvZsvbNNRMQX4PmqRN7wQ/A IGOV/ItywrRnxs31xNMtvCL6yBzkq0bAPTSqly8bDODt8v+mMCobCPoXto4sNpRR7UEzQx EZ3LPL3DX5aIOPozMA1AvZuYkUxqOnRkRCq3PuTGQkzekPf6LfBupY/vahwcug== 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 4Mhkcr5cNnzdKw; Tue, 4 Oct 2022 17:06:20 +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 294H6Kgu099433; Tue, 4 Oct 2022 17:06:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 294H6Kak099432; Tue, 4 Oct 2022 17:06:20 GMT (envelope-from git) Date: Tue, 4 Oct 2022 17:06:20 GMT Message-Id: <202210041706.294H6Kak099432@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: 6a720fb95a1b - main - git-arc: Fix handling of review title containing double quotes 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: 6a720fb95a1bc39c6417fa6200789edfe99d5256 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664903180; 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=PP8dz25eCJviu0QsWn8YuWCMXkRNNQgBdAnYhY8unpM=; b=VENxKyRTyXive+zvqtCXJgc3WeYzW362pAL3WVEn2xf67YEMwCexDSqhwhuyD6afcXrlq7 dnPWSN7pbHisJGTmVJXtqShAgNdJexF1WIyjnORDp23CA07njmW+Kh0CR4MP1hSn8DrHTR 0GBjeQ6k9Uf3YwqozaUGH3eaP0oqHIA7ULt+xPbZ4xxoom5UEAWdCcvNFPSkFkPloGQd1i XC0TASV71OOtJAE9fHcMAsabJp9sFiWBbu5ExQxr1VReGDsMd6AgssLbv4pXejOpiHTmKq MKPuOjvzo2Tyxu3wUgkM8N1Ozm+JaLaSJl2Xw19tqUogP1IrFEmYnI3qNBQBLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664903180; a=rsa-sha256; cv=none; b=JHx6sIED6M13q5MiEEsk+g57j6JHZv8c1vrFoADQbDSFMMfnmmSuUIKeky6JJDAPQ+7s9T mL3TQAnm88VR5vVMmzSlnJ67ppSo7c4q3wu3z1exnteNAcfTjOTbi3UQkqL73MLCR3Xnkk r3o3ktIGweFI9w/aIvSKFIWOIT9oblKMZLIMM0B2mmW9WGPpt53YmtsvcXL9h1bAIvOgpx 1fso7F8a1RkQ/yEnRmmGxCMk5fBmpZcP5uH9CBSLH0ysy03Sia1gq8FFUN/IyQqv/UZajA 9Pg7nVmr/R4AeFdrbeUpC5ys9jsABn83uv72HBRukVeOCpF8TRYj5e6GyRIurQ== 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=6a720fb95a1bc39c6417fa6200789edfe99d5256 commit 6a720fb95a1bc39c6417fa6200789edfe99d5256 Author: Mark Johnston AuthorDate: 2022-10-04 16:59:13 +0000 Commit: Mark Johnston CommitDate: 2022-10-04 17:05:54 +0000 git-arc: Fix handling of review title containing double quotes --- tools/tools/git/git-arc.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index 22a13aa307bd..a9faed2ea876 100644 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -193,7 +193,7 @@ title2diff() { local title - title=$1 + title=$(echo $1 | sed 's/"/\\"/g') # arc list output always includes ANSI escape sequences, strip them. arc list | sed 's/\x1b\[[0-9;]*m//g' | \ awk -F': ' '{ @@ -422,7 +422,8 @@ gitarc__list() # differently and keep the entire status. title=$(git show -s --format=%s "$commit") diff=$(echo "$openrevs" | \ - awk -F'D[1-9][0-9]*:\.\\[m ' '{if ($2 == "'"$title"'") print $0}') + awk -F'D[1-9][0-9]*:\.\\[m ' \ + '{if ($2 == "'"$(echo $title | sed 's/"/\\"/g')"'") print $0}') if [ -z "$diff" ]; then echo "No Review : $title" elif [ "$(echo "$diff" | wc -l)" -ne 1 ]; then