From fe011304e7cddc0080ca59cb0df0bbe21bf203bb Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 17 Jan 2009 10:40:51 +0000
Subject: * configure.in (VCSUP): fixed the cases for git-svn or git.

* win32/Makefile.sub (VCSUP): ditto.

* Makefile.in (up): `cd' is necessary for git and git-svn.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 configure.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index 77c00343a5..264903ea3f 100644
--- a/configure.in
+++ b/configure.in
@@ -2172,10 +2172,10 @@ AC_CONFIG_FILES(Makefile, [{
 	    VCSUP='$(VCS) up $(SVNUPOPTIONS)'
 	elif test -d "$srcdir/.git/svn"; then
 	    VCS='git svn'
-	    VCSUP='$(VCS) up $(SVNUPOPTIONS)'
+	    VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'
 	elif test -d "$srcdir/.git"; then
 	    VCS='git'
-	    VCSUP='$(VCS) up $(GITUPOPTIONS)'
+	    VCSUP='$(VCS) pull $(GITPULLOPTIONS)'
 	else
 	    VCS='echo cannot'
 	    VCSUP='$(VCS)'
-- 
cgit v1.2.3