Takashi Kokubun	2019-04-24 23:26:56 +0900 (Wed, 24 Apr 2019)

  New Revision: 6061aa0ac1

  https://git.ruby-lang.org/ruby.git/commit/?id=3D6061aa0ac1

  Log:
    Automatically gpg-sign rebase when commit.gpgsign
    =

    is true
    =

    Closes: https://github.com/ruby/ruby/pull/2148

  Modified files:
    defs/gmake.mk=
From 6061aa0ac1b4d43d107d47ba4d2eecbda77959a1 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Wed, 24 Apr 2019 23:26:56 +0900
Subject: Automatically gpg-sign rebase when commit.gpgsign

is true

Closes: https://github.com/ruby/ruby/pull/2148

diff --git a/defs/gmake.mk b/defs/gmake.mk
index 9a11df1..73ae01b 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -153,8 +153,8 @@ commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS https://github.com/ruby/ruby/blob/trunk/#L153
 		VCSUP="" ENC_MK=.top-enc.mk REVISION_FORCE=PHONY CONFIGURE="$(CONFIGURE)" -f - \
 		update-src srcs all-incs
 
-PR =
 GITHUB_RUBY_URL = https://github.com/ruby/ruby
+PR =
 
 .PHONY: fetch-github
 fetch-github:
@@ -162,7 +162,7 @@ fetch-github: https://github.com/ruby/ruby/blob/trunk/#L162
 	  echo "usage:"; echo "  make $@ PR=1234"; \
 	  exit 1; \
 	fi
-	$(Q) if ! git config remote.github.url > /dev/null; then \
+	$(Q) if ! git -C "$(srcdir)" config remote.github.url > /dev/null; then \
 	  echo adding $(GITHUB_RUBY_URL) as remote github; \
 	  git -C "$(srcdir)" remote add github $(GITHUB_RUBY_URL); \
 	fi
@@ -176,9 +176,12 @@ merge-github: fetch-github https://github.com/ruby/ruby/blob/trunk/#L176
 	git -C "$(srcdir)" checkout -
 	git -C "$(srcdir)" merge --ff-only "gh-$(PR)"
 	git -C "$(srcdir)" branch -D "gh-$(PR)"
-	git -C "$(srcdir)" filter-branch -f --msg-filter \
-	  'cat && echo && echo "Closes: $(GITHUB_RUBY_URL)/pull/$(PR)"' \
+	git -C "$(srcdir)" filter-branch -f \
+	  --msg-filter 'cat && echo && echo "Closes: $(GITHUB_RUBY_URL)/pull/$(PR)"' \
 	  -- "$(GITHUB_MERGE_BASE)..@"
+	$(Q) if [ "$$(git -C "$(srcdir)" config commit.gpgsign)" = true ]; then \
+	  git -C "$(srcdir)" rebase --exec "git commit --amend --no-edit -S" "$(GITHUB_MERGE_BASE)"; \
+	fi
 
 ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2)
 extract-gems: update-gems
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/