summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2016-07-18 20:06:27 +0000
committerHans Wennborg <hans@hanshq.net>2016-07-18 20:06:27 +0000
commit39eff98d387c10ad10dfa42b0a46c6e387241fed (patch)
treee67ad5a0b2d349ce54b0c4465de1c73f3928309d
parentbf51e703cfaf006f3f162d837435de4815e9007e (diff)
downloadbcm5719-llvm-39eff98d387c10ad10dfa42b0a46c6e387241fed.tar.gz
bcm5719-llvm-39eff98d387c10ad10dfa42b0a46c6e387241fed.zip
Revert r273099 "If the revision number starts with r, drop it. It will get added back"
This doesn't seem to work with Bash: $ /work/llvm/utils/release/merge.sh --proj llvm --rev r275870 /work/llvm/utils/release/merge.sh: line 34: ${$1#r}: bad substitution I get the same error with and without a leading 'r'. llvm-svn: 275898
-rwxr-xr-xllvm/utils/release/merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/utils/release/merge.sh b/llvm/utils/release/merge.sh
index e241dcde295..b4893224834 100755
--- a/llvm/utils/release/merge.sh
+++ b/llvm/utils/release/merge.sh
@@ -31,7 +31,7 @@ while [ $# -gt 0 ]; do
case $1 in
-rev | --rev | -r )
shift
- rev=${$1#r}
+ rev=$1
;;
-proj | --proj | -project | --project | -p )
shift
OpenPOWER on IntegriCloud