merge revision(s) r47641,r47642,r47644: [Backport ruby#10262]

nagachika · nagachika · commit ee69bb41bea7 · 2014-09-23T17:22:03.000Z
* 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).

	* win32/Makefile.sub (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/branches/ruby_2_1@47702 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Sep 24 02:21:41 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (VCSUP): nothing to do if this worktree is not
+	  under any VCS (it means that the worktree may be from the release
+	  package).
+
 Wed Sep 24 02:06:33 2014  Tanaka Akira  <akr@fsij.org>
 
 	* test/ruby/test_time_tz.rb: Fix test error with tzdata-2014g.
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.4"
 #define RUBY_RELEASE_DATE "2014-09-24"
-#define RUBY_PATCHLEVEL 245
+#define RUBY_PATCHLEVEL 246
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9
diff --git 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)
+!else
+VCSUP = rem
 !endif
 ruby_pc = $(RUBY_BASE_NAME)-$(MAJOR).$(MINOR).pc
 
