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

From e173012f44dfef513c18d69abbd01b3354e897ed Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Wed, 14 Aug 2019 23:41:30 +0900
Subject: Drop obsoleted `make merge-github` task


diff --git a/defs/gmake.mk b/defs/gmake.mk
index 6a8071a..f69e0d3 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -191,10 +191,6 @@ checkout-github: fetch-github https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L191
 pull-github: fetch-github
 	$(call pull-github,$(PR))
 
-.PHONY: merge-github
-merge-github: pull-github
-	$(call merge-github,$(PR))
-
 define pull-github
 	$(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))
@@ -208,12 +204,6 @@ define pull-github https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L204
 	git -C "$(GITHUB_MERGE_WORKTREE)" rebase --exec "git notes add --message 'Merged: $(GITHUB_RUBY_URL)/pull/$(1)'" "$(GITHUB_MERGE_BASE)"
 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-%
 fetch-github-%:
 	$(call fetch-github,$*)
@@ -226,14 +216,9 @@ checkout-github-%: fetch-github-% https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L216
 pr-% pull-github-%: fetch-github-%
 	$(call pull-github,$*)
 
-.PHONY: merge-github-%
-merge-github-%: pull-github-%
-	$(call merge-github,$*)
-
 HELP_EXTRA_TASKS = \
 	"  checkout-github:     checkout GitHub Pull Request [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)
-- 
cgit v0.10.2


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