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

Automatically gpg-sign rebase when commit.gpgsign

Browse source 
is true

Closes: https://github.com/ruby/ruby/pull/2148
This commit is contained in:
Takashi Kokubun 2019-04-24 23:26:56 +09:00
parent daff4cbd6c
commit 6061aa0ac1
No known key found for this signature in database
GPG key ID: 6FFC433B12EE23DD
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
defs/gmake.mk
View file

@ -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