From 394b6717243f41002d306a9c3472b7da9f496b2a Mon Sep 17 00:00:00 2001
From: Hans Wennborg <hans@hanshq.net>
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'.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@275898 91177308-0d34-0410-b5e6-96231b3b80d8
---
utils/release/merge.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/release/merge.sh b/utils/release/merge.sh
index e241dcde295..b4893224834 100755
--- a/utils/release/merge.sh
+++ b/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