From 2aa9658730687fe4a64cd2b01071ad375c268946 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 19 Sep 2014 06:49:56 +0000 Subject: * 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 --- ChangeLog | 5 +++++ win32/Makefile.sub | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index c5310a033f..a44ab3126a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 19 15:48:09 2014 NAKAMURA Usaku + + * 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 * test/ruby/test_math.rb (TestMath#assert_infinity): Float#finite? diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 259e56b81f..09921a2094 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 -- cgit v1.2.3