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

Add make fetch-github and make merge-github

Browse source 
Closes: https://github.com/ruby/ruby/pull/2147
This commit is contained in:
Takashi Kokubun 2019-04-24 22:40:54 +09:00
parent 2642f22050
commit daff4cbd6c
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
defs/gmake.mk
View file

@ -153,6 +153,33 @@ 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
.PHONY: fetch-github
fetch-github:
$(Q) if [ -z "$(PR)" ]; then \
echo "usage:"; echo " make $@ PR=1234"; \
exit 1; \
fi
$(Q) if ! git 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
git -C "$(srcdir)" fetch -f github "pull/$(PR)/head:gh-$(PR)"
.PHONY: merge-github
merge-github: fetch-github
$(Q) $(eval GITHUB_MERGE_BASE := $(shell git -C "$(srcdir)" log -1 --format=format:%H))
git -C "$(srcdir)" checkout "gh-$(PR)"
git -C "$(srcdir)" rebase -
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)"' \
-- "$(GITHUB_MERGE_BASE)..@"
ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2)
extract-gems: update-gems
endif