1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

No longer svn & git-svn are used

This commit is contained in:
Nobuyoshi Nakada 2019-05-10 15:22:54 +09:00
parent dbcc224f38
commit 9a4d39b95e
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
2 changed files with 2 additions and 15 deletions

View file

@ -3908,20 +3908,12 @@ AC_CONFIG_FILES(Makefile, [
{ {
AS_IF([test ${VCS+set}], [ AS_IF([test ${VCS+set}], [
: :
], [svn info "$srcdir" > /dev/null 2>&1], [
VCS='svn'
], [git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`], [ ], [git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`], [
AS_IF([test -d "$git_dir/svn"], [ VCS='$(GIT)'
VCS='$(GIT) svn'
], [
VCS='$(GIT)'
])
], [ ], [
VCS='echo cannot' VCS='echo cannot'
]) ])
AS_CASE("$VCS", AS_CASE("$VCS",
[svn], [VCSUP='$(VCS) up $(SVNUPOPTIONS)'],
['$(GIT) svn'], [VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'],
['$(GIT)'|git], [VCSUP='$(VCS) pull $(GITPULLOPTIONS)'], ['$(GIT)'|git], [VCSUP='$(VCS) pull $(GITPULLOPTIONS)'],
[VCSUP='$(VCS)']) [VCSUP='$(VCS)'])
sed -n \ sed -n \

View file

@ -495,12 +495,7 @@ HAVE_GIT = no
! endif ! endif
!endif !endif
!if exist($(srcdir)/.svn) !if defined(VCS)
VCS = svn
VCSUP = $(VCS) up $(SVNUPOPTIONS)
!else if exist($(srcdir)/.git/svn)
VCS = $(GIT) svn
VCSUP = $(VCS) rebase $(GITSVNREBASEOPTIONS)
!else if exist($(srcdir)/.git) !else if exist($(srcdir)/.git)
VCS = $(GIT) VCS = $(GIT)
VCSUP = $(VCS) pull $(GITPULLOPTIONS) VCSUP = $(VCS) pull $(GITPULLOPTIONS)