[前][次][番号順一覧][スレッド一覧]

ruby-changes:46393

From: nobu <ko1@a...>
Date: Sun, 30 Apr 2017 12:52:12 +0900 (JST)
Subject: [ruby-changes:46393] nobu:r58507 (trunk): git-refresh: fix for Solaris

nobu	2017-04-30 12:52:06 +0900 (Sun, 30 Apr 2017)

  New Revision: 58507

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58507

  Log:
    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]

  Modified files:
    trunk/tool/git-refresh
Index: tool/git-refresh
===================================================================
--- tool/git-refresh	(revision 58506)
+++ tool/git-refresh	(revision 58507)
@@ -29,14 +29,15 @@ done https://github.com/ruby/ruby/blob/trunk/tool/git-refresh#L29
 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]