diff options
| author | Takashi Kokubun <takashikkbn@gmail.com> | 2019-08-14 23:41:30 +0900 |
|---|---|---|
| committer | Takashi Kokubun <takashikkbn@gmail.com> | 2019-08-14 23:41:41 +0900 |
| commit | e173012f44dfef513c18d69abbd01b3354e897ed (patch) | |
| tree | f120e062116d8c88939c209125e89ae4afd2c71c /defs | |
| parent | 7da40d74e12cee72b96554a2d201965f1c7dedd7 (diff) | |
| download | ruby-e173012f44dfef513c18d69abbd01b3354e897ed.tar.gz | |
Drop obsoleted `make merge-github` task
Diffstat (limited to 'defs')
| -rw-r--r-- | defs/gmake.mk | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk index 6a8071a536..f69e0d30cd 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -191,10 +191,6 @@ checkout-github: fetch-github 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 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-% 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) |