From 52a5514ddf33782915338944596be28271285fe5 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Sat, 31 Dec 2016 14:44:51 -0600 Subject: do-release-commit-and-tag: avoid shell syntax error Tagging during a rebase doesn't make sense, but it at least should not choke with: $ ./build-aux/do-release-commit-and-tag 1.4.18 stable ./build-aux/do-release-commit-and-tag: line 146: test: too many arguments do-release-commit-and-tag: not on branch (no branch, rebasing branch-1.4) * build-aux/do-release-commit-and-tag (curr_br): $branch can contain spaces when rebasing. Signed-off-by: Eric Blake --- build-aux/do-release-commit-and-tag | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build-aux/do-release-commit-and-tag') diff --git a/build-aux/do-release-commit-and-tag b/build-aux/do-release-commit-and-tag index b4f3251f8c..02e5f52d4a 100755 --- a/build-aux/do-release-commit-and-tag +++ b/build-aux/do-release-commit-and-tag @@ -3,7 +3,7 @@ # controlled .prev-version file, automate the procedure by which we record # the date, release-type and version string in the NEWS file. That commit # will serve to identify the release, so apply a signed tag to it as well. -VERSION=2016-01-12.23 # UTC +VERSION=2016-12-31.14 # UTC # Note: this is a bash script (could be zsh or dash) @@ -143,7 +143,7 @@ esac # Ensure the current branch name is correct: curr_br=$(git rev-parse --symbolic-full-name HEAD) -test "$curr_br" = refs/heads/$branch || die not on branch $branch +test "$curr_br" = "refs/heads/$branch" || die not on branch $branch # Extract package name from Makefile. Makefile=$builddir/Makefile -- cgit v1.2.1