From 2f22588000fc4027ec2d9366186c1a8efb68c7a4 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 24 Apr 2017 11:52:14 +0000
Subject: tool/git-refresh: fix branch operations

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

(limited to 'tool')

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