archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 21:14:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Drop obsoleted make merge-github task

Browse source
This commit is contained in:
Takashi Kokubun 2019-08-14 23:41:30 +09:00
parent 7da40d74e1
commit e173012f44
No known key found for this signature in database
GPG key ID: 6FFC433B12EE23DD
1 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
defs/gmake.mk
View file

@ -191,10 +191,6 @@ checkout-github: fetch-github
pull-github: fetch-github pull-github: fetch-github
$(call pull-github,$(PR)) $(call pull-github,$(PR))
.PHONY: merge-github
merge-github: pull-github
$(call merge-github,$(PR))
define pull-github define pull-github
$(eval GITHUB_MERGE_BASE := $(shell git -C "$(srcdir)" log -1 --format=format:%H)) $(eval GITHUB_MERGE_BASE := $(shell git -C "$(srcdir)" log -1 --format=format:%H))
$(eval GITHUB_MERGE_BRANCH := $(shell git -C "$(srcdir)" symbolic-ref --short HEAD)) $(eval GITHUB_MERGE_BRANCH := $(shell git -C "$(srcdir)" symbolic-ref --short HEAD))
@ -208,12 +204,6 @@ define pull-github
git -C "$(GITHUB_MERGE_WORKTREE)" rebase --exec "git notes add --message 'Merged: $(GITHUB_RUBY_URL)/pull/$(1)'" "$(GITHUB_MERGE_BASE)" git -C "$(GITHUB_MERGE_WORKTREE)" rebase --exec "git notes add --message 'Merged: $(GITHUB_RUBY_URL)/pull/$(1)'" "$(GITHUB_MERGE_BASE)"
endef endef
define merge-github
git -C "$(srcdir)" worktree remove $(notdir $(GITHUB_MERGE_WORKTREE))
git -C "$(srcdir)" merge --ff-only "gh-$(1)"
git -C "$(srcdir)" branch -D "gh-$(1)"
endef
.PHONY: fetch-github-% .PHONY: fetch-github-%
fetch-github-%: fetch-github-%:
$(call fetch-github,$*) $(call fetch-github,$*)
@ -226,14 +216,9 @@ checkout-github-%: fetch-github-%
pr-% pull-github-%: fetch-github-% pr-% pull-github-%: fetch-github-%
$(call pull-github,$*) $(call pull-github,$*)
.PHONY: merge-github-%
merge-github-%: pull-github-%
$(call merge-github,$*)
HELP_EXTRA_TASKS = \ HELP_EXTRA_TASKS = \
" checkout-github: checkout GitHub Pull Request [PR=1234]" \ " checkout-github: checkout GitHub Pull Request [PR=1234]" \
" pull-github: rebase GitHub Pull Request to new worktree [PR=1234]" \ " pull-github: rebase GitHub Pull Request to new worktree [PR=1234]" \
" merge-github: merge GitHub Pull Request to current HEAD [PR=1234]" \
"" ""
ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2) ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2)