diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
2 files changed, 7 insertions, 0 deletions
@@ -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 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 |