summaryrefslogtreecommitdiff
path: root/utils/release
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
commit394b6717243f41002d306a9c3472b7da9f496b2a (patch)
tree90b878b8e042a8507a5a066650fe124371c31e9f /utils/release
parent67e73ac68f934fa1a96d7993ea1add5b6da2ba4d (diff)
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
Diffstat (limited to 'utils/release')
-rwxr-xr-xutils/release/merge.sh2
1 files changed, 1 insertions, 1 deletions
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