From 7fab738e377bb37dc9efaa559509f6f46d24b3d8 Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Thu, 14 Sep 2017 12:56:15 -0700 Subject: util: fix bug in tagbranch After mulptiple edits of the script, there is a case when bash variable is not properly quoted, let's fix it. BRANCH=cr50 BUG=b:64698702 TEST=verified proper tag description set by git Change-Id: I5847437cde717bb6e1f4b672fe6008b8e6e6f4e3 Signed-off-by: Vadim Bendebury Reviewed-on: https://chromium-review.googlesource.com/667917 Reviewed-by: Vincent Palatin Reviewed-by: Shawn N (cherry picked from commit 4fdccb6de5131475fb6ccd3402812e008091afa3) Reviewed-on: https://chromium-review.googlesource.com/668820 (cherry picked from commit 0ddc5fa840c142a955087a5b5e36217139b3fb3f) Reviewed-on: https://chromium-review.googlesource.com/669055 --- util/tagbranch.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/tagbranch.sh b/util/tagbranch.sh index bcc71a4806..3e196b6f25 100755 --- a/util/tagbranch.sh +++ b/util/tagbranch.sh @@ -67,7 +67,8 @@ TAG="v1.${TAG_BASE}.0" BASE_SHA="$(git rev-list --ancestry-path "${BRANCH_POINT}".."${UPSTREAM}" | tail -1)" -if git tag -a -m 'firmware branch ${TAG}' "${TAG}" "${BASE_SHA}"; then +echo "Will run git tag -a -m \"firmware branch ${TAG}\" ${TAG} ${BASE_SHA}" +if git tag -a -m "firmware branch ${TAG}" "${TAG}" "${BASE_SHA}"; then cat <