diff options
| author | Eric Blake <eblake@redhat.com> | 2016-12-31 14:44:51 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2016-12-31 14:44:51 -0600 |
| commit | 52a5514ddf33782915338944596be28271285fe5 (patch) | |
| tree | 0d5d1290549bf4008cd55b3d40c69d5e010450ee /build-aux/do-release-commit-and-tag | |
| parent | 5996001fc550d7e12292f22f312176014f787243 (diff) | |
| download | gnulib-52a5514ddf33782915338944596be28271285fe5.tar.gz | |
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 <eblake@redhat.com>
Diffstat (limited to 'build-aux/do-release-commit-and-tag')
| -rwxr-xr-x | build-aux/do-release-commit-and-tag | 4 |
1 files changed, 2 insertions, 2 deletions
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 |