From 57108574563c7cbd9f753ab3ee32f34674209d40 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 13 Apr 2017 08:08:04 +0000 Subject: git-refresh: for symlink srcdir * tool/git-refresh: use `cd -P` for symlink srcdir. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/git-refresh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'tool/git-refresh') diff --git a/tool/git-refresh b/tool/git-refresh index 88ed70f757..2f41ba1b9d 100755 --- a/tool/git-refresh +++ b/tool/git-refresh @@ -1,15 +1,21 @@ #!/bin/sh set -e +if cd -P . 2>/dev/null; then + CHDIR='cd -P' +else + CHDIR='cd' +fi + quiet= branch= until [ $# = 0 ]; do case "$1" in --) shift; break;; - -C|--directory) shift; cd "$1";; - -C*) cd `expr "$1" : '-C\(.*\)'`;; - --directory=*) cd `expr "$1" : '[^=]*=\(.*\)'`;; + -C|--directory) shift; $CHDIR "$1";; + -C*) $CHDIR `expr "$1" : '-C\(.*\)'`;; + --directory=*) $CHDIR `expr "$1" : '[^=]*=\(.*\)'`;; -q) quiet=1;; -b|--branch) shift; branch="$1";; -b*) branch=`expr "$1" : '-b\(.*\)'`;; @@ -26,7 +32,7 @@ shift 2 if [ -d "$dir" ]; then echo updating `expr "/$dir/" : '.*/\([^/][^/]*\)/'` ... [ $quiet ] || set -x - cd "$dir" + $CHDIR "$dir" git fetch "$@" exec git checkout ${branch:+"$branch"} "$@" else -- cgit v1.2.3