From eeed8b96a19cfaa06e51ee75059e23db2e72c67b Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 30 Apr 2017 03:52:06 +0000
Subject: git-refresh: fix for Solaris

* tool/git-refresh: unset variable `branch` if it is null, to get
  rid of substitutions which are not supported old Solaris.
  [ruby-dev:50102] [Bug #13522]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58507 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 tool/git-refresh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'tool')

diff --git a/tool/git-refresh b/tool/git-refresh
index 2ee5bbfa39..1c1689cd2c 100755
--- a/tool/git-refresh
+++ b/tool/git-refresh
@@ -29,14 +29,15 @@ done
 url="$1"
 dir="$2"
 shift 2
+[ x"$branch" = x ] && unset branch || :
 if [ -d "$dir" ]; then
     echo updating `expr "/$dir/" : '.*/\([^/][^/]*\)/'` ...
     [ $quiet ] || set -x
     $CHDIR "$dir"
-    ${branch:+git fetch "$@"}
-    exec git ${branch:+checkout} "${branch:-pull}" "$@"
+    ${branch+git fetch "$@"}
+    exec git ${branch+checkout} "${branch-pull}" "$@"
 else
     echo retrieving `expr "/$dir/" : '.*/\([^/][^/]*\)/'` ...
     [ $quiet ] || set -x
-    exec git clone ${branch:+--branch "$branch"} "$url" "$dir" "$@"
+    exec git clone ${branch+--branch "$branch"} "$url" "$dir" "$@"
 fi
-- 
cgit v1.2.3