diff options
author | Tom Stellard <thomas.stellard@amd.com> | 2015-05-11 19:46:44 +0000 |
---|---|---|
committer | Tom Stellard <thomas.stellard@amd.com> | 2015-05-11 19:46:44 +0000 |
commit | c90bbf95465dac6c14c5908ce7b26ee6b0b496b6 (patch) | |
tree | 3cc93b162e1e73d3e3311724e19848f0f2ea11a3 | |
parent | c42617ccffc63691c7df589e6f49e36e16e1da89 (diff) | |
download | llvm-c90bbf95465dac6c14c5908ce7b26ee6b0b496b6.zip llvm-c90bbf95465dac6c14c5908ce7b26ee6b0b496b6.tar.gz llvm-c90bbf95465dac6c14c5908ce7b26ee6b0b496b6.tar.bz2 |
Merging r226124:llvmorg-3.6.1-rc1
------------------------------------------------------------------------
r226124 | hans | 2015-01-14 23:36:20 -0500 (Wed, 14 Jan 2015) | 2 lines
utils/release/tag.sh: fix -revision vs. -rc check
------------------------------------------------------------------------
llvm-svn: 237015
-rwxr-xr-x | llvm/utils/release/tag.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/utils/release/tag.sh b/llvm/utils/release/tag.sh index 2dfba04..503413b 100755 --- a/llvm/utils/release/tag.sh +++ b/llvm/utils/release/tag.sh @@ -117,7 +117,7 @@ tag_release=`echo $release | sed -e 's,\.,,g'` if [ "x$rc" = "x" ]; then tag_version else - if [ "x$revision" != "x" ]; then + if [ "$revision" != "HEAD" ]; then echo "error: cannot use -revision with -rc" echo usage |