diff options
| author | Takashi Kokubun <takashikkbn@gmail.com> | 2019-04-24 23:26:56 +0900 |
|---|---|---|
| committer | Takashi Kokubun <takashikkbn@gmail.com> | 2019-04-25 00:12:13 +0900 |
| commit | 6061aa0ac1b4d43d107d47ba4d2eecbda77959a1 (patch) | |
| tree | a0c7bf7ece51764ea896a3cdd02cd1c181ec82c1 /defs | |
| parent | daff4cbd6c7d6be07ae094bda45bca076b37a375 (diff) | |
Automatically gpg-sign rebase when commit.gpgsign
is true
Closes: https://github.com/ruby/ruby/pull/2148
Diffstat (limited to 'defs')
| -rw-r--r-- | defs/gmake.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk index 9a11df1316..73ae01bf12 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -153,8 +153,8 @@ commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS 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: 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 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 |