From 67ba7ad3e69b75ff21d744a595074883493dbdc7 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 13 Apr 2017 07:52:05 +0000 Subject: git-refresh: fix expr * tool/git-refresh (dir): surround by slashes to extract base name. [ruby-dev:50070] [Bug #13424] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58335 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/git-refresh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tool/git-refresh') diff --git a/tool/git-refresh b/tool/git-refresh index fbb50bdcc1..88ed70f757 100755 --- a/tool/git-refresh +++ b/tool/git-refresh @@ -24,13 +24,13 @@ url="$1" dir="$2" shift 2 if [ -d "$dir" ]; then - echo updating `expr "$dir" : '*/\(.*\)'` ... + echo updating `expr "/$dir/" : '.*/\([^/][^/]*\)/'` ... [ $quiet ] || set -x cd "$dir" git fetch "$@" exec git checkout ${branch:+"$branch"} "$@" else - echo retrieving `expr "$dir" : '*/\(.*\)'` ... + echo retrieving `expr "/$dir/" : '.*/\([^/][^/]*\)/'` ... [ $quiet ] || set -x exec git clone "$url" "$dir" "$@" fi -- cgit v1.2.3