summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-19 06:49:56 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-19 06:49:56 +0000
commit2aa9658730687fe4a64cd2b01071ad375c268946 (patch)
treed4e9f2ae6ce90696c8d07bfc25f337e75f70f538
parenteb0e3fe78fa5338299fde5e5263121df1a64493c (diff)
* win32/win32.c (VCSUP): nothing to do if this worktree is not under
any VCS (it means that the worktree may be from the release package). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47641 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/Makefile.sub2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c5310a0..a44ab31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 19 15:48:09 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (VCSUP): nothing to do if this worktree is not under
+ any VCS (it means that the worktree may be from the release package).
+
Fri Sep 19 10:47:03 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/ruby/test_math.rb (TestMath#assert_infinity): Float#finite?
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 259e56b..09921a2 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -377,6 +377,8 @@ VCSUP = $(VCS) rebase $(GITSVNREBASEOPTIONS)
!else if exist($(srcdir)/.git)
VCS = git
VCSUP = $(VCS) pull $(GITPULLOPTIONS)
+!ekse
+VCSUP = rem
!endif
ruby_pc = $(RUBY_BASE_NAME)-$(MAJOR).$(MINOR).pc