From 047471c52960e32146025fab064487d25f92a141 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Thu, 4 Jun 2020 10:26:40 +0900
Subject: [PATCH] No GITPULLOPTIONS by default

To honor the environment variable, keep GITPULLOPTIONS unset by
default, and appended the option to VCSUP.
---
 .github/workflows/compilers.yml | 2 +-
 .github/workflows/macos.yml     | 2 +-
 .github/workflows/mingw.yml     | 2 +-
 .github/workflows/mjit.yml      | 2 +-
 .github/workflows/ubuntu.yml    | 2 +-
 .github/workflows/windows.yml   | 2 +-
 common.mk                       | 2 +-
 configure.ac                    | 2 +-
 win32/Makefile.sub              | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml
index 31d71e62b5..bc2cc37c4e 100644
--- a/.github/workflows/compilers.yml
+++ b/.github/workflows/compilers.yml
@@ -33,7 +33,7 @@ env:
     UNICODE_AUXILIARY_FILES=.
     UNICODE_EMOJI_FILES=.
   CONFIGURE_TTY: never
-  GITPULLOPTIONS: --no-tags
+  GITPULLOPTIONS: --no-tags origin ${{github.ref}}
   RUBY_DEBUG: ci rgengc
   RUBY_TESTOPTS: >-
     -q
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 0c1eaadcb1..bce25ce6bf 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -8,7 +8,7 @@ jobs:
         test_task: [ "check", "test-bundler", "test-bundled-gems", "leaked-globals" ]
       fail-fast: false
     env:
-      GITPULLOPTIONS: --no-tags
+      GITPULLOPTIONS: --no-tags origin ${{github.ref}}
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
       - name: Disable Firewall
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index 576308ee6c..c109790013 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -17,7 +17,7 @@ jobs:
       CPPFLAGS: "-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048"
       LDFLAGS:  "-pipe -fstack-protector-strong"
       UPDATE_UNICODE: "UNICODE_FILES=. UNICODE_PROPERTY_FILES=. UNICODE_AUXILIARY_FILES=. UNICODE_EMOJI_FILES=."
-      GITPULLOPTIONS: --no-tags
+      GITPULLOPTIONS: --no-tags origin ${{github.ref}}
     strategy:
       matrix:
         test_task: [ "check" ] # to make job names consistent
diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml
index 244bb60696..c804683ad0 100644
--- a/.github/workflows/mjit.yml
+++ b/.github/workflows/mjit.yml
@@ -12,7 +12,7 @@ jobs:
     env:
       TESTOPTS: '-q --tty=no'
       RUN_OPTS: '--disable-gems --jit-warnings ${{ matrix.jit_opts }}'
-      GITPULLOPTIONS: --no-tags
+      GITPULLOPTIONS: --no-tags origin ${{github.ref}}
     steps:
       - name: Install libraries
         run: |
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index c7b8b38cdd..42c0264b17 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -24,7 +24,7 @@ jobs:
             debug: -DRUBY_DEBUG
       fail-fast: false
     env:
-      GITPULLOPTIONS: --no-tags
+      GITPULLOPTIONS: --no-tags origin ${{github.ref}}
     runs-on: ${{ matrix.os }}
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index c4626180f4..a3822c357f 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.os }}
     env:
-      GITPULLOPTIONS: --no-tags
+      GITPULLOPTIONS: --no-tags origin ${{github.ref}}
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
       - uses: actions/cache@v1
diff --git a/common.mk b/common.mk
index 42da518a3a..a7bb4950d9 100644
--- a/common.mk
+++ b/common.mk
@@ -38,7 +38,7 @@ RUBYLIB       = $(PATH_SEPARATOR)
 RUBYOPT       = -
 RUN_OPTS      = --disable-gems
 
-GITPULLOPTIONS = --rebase
+# GITPULLOPTIONS = --no-tags
 
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(UNICODE_HDR_DIR)
 
diff --git a/configure.ac b/configure.ac
index 71e71dd47a..d4dbbf81fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4055,7 +4055,7 @@ AC_CONFIG_FILES(Makefile:template/Makefile.in, [
 	    VCS='echo cannot'
 	])
 	AS_CASE("$VCS",
-		['$(GIT)'|git], [VCSUP='$(VCS) pull $(GITPULLOPTIONS)'],
+		['$(GIT)'|git], [VCSUP='$(VCS) pull --rebase $(GITPULLOPTIONS)'],
 		[VCSUP='$(VCS)'])
 	sed -n \
 	    -e '[/^@%:@define \(RUBY_RELEASE_[A-Z]*\) \([0-9][0-9]*\)/]{' \
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index df9eab2587..df85095ddf 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -499,7 +499,7 @@ HAVE_GIT = no
 !if defined(VCS)
 !else if exist($(srcdir)/.git)
 VCS = $(GIT)
-VCSUP = $(VCS) pull $(GITPULLOPTIONS)
+VCSUP = $(VCS) pull --rebase $(GITPULLOPTIONS)
 !else
 VCSUP = rem
 !endif