From 39eff98d387c10ad10dfa42b0a46c6e387241fed Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Mon, 18 Jul 2016 20:06:27 +0000 Subject: [PATCH] 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 --- llvm/utils/release/merge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm/utils/release/merge.sh b/llvm/utils/release/merge.sh index e241dcd..b489322 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 -- 2.7.4