From f1dea158d09f2738f99c99f19c83635534317099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wenkai=20Yin=28=E5=B0=B9=E6=96=87=E5=BC=80=29?= Date: Tue, 15 Feb 2022 14:09:34 +0800 Subject: [PATCH] Don't exit when getting no match for grep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don't exit when getting no match for grep Signed-off-by: Wenkai Yin(尹文开) --- hack/release-tools/tag-release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/release-tools/tag-release.sh b/hack/release-tools/tag-release.sh index a8591a899..11a56887f 100755 --- a/hack/release-tools/tag-release.sh +++ b/hack/release-tools/tag-release.sh @@ -138,8 +138,8 @@ if [[ -n $release_branch_name ]]; then remote_release_branch_name="$remote/$release_branch_name" # Determine whether the local and remote release branches already exist - local_branch=$(git branch | grep "$release_branch_name") - remote_branch=$(git branch -r | grep "$remote_release_branch_name") + local_branch=$(git branch | { grep "$release_branch_name" || true; }) + remote_branch=$(git branch -r | { grep "$remote_release_branch_name" || true;}) if [[ -z $remote_branch ]]; then echo "The branch $remote_release_branch_name must be created before you tag the release." exit 1