ruby-changes:57054
From: Takashi <ko1@a...>
Date: Fri, 16 Aug 2019 01:18:46 +0900 (JST)
Subject: [ruby-changes:57054] Takashi Kokubun: 789f17665e (master): Make `make update-github` idempotent
https://git.ruby-lang.org/ruby.git/commit/?id=789f17665e From 789f17665e87ddfe76ef2f7bf344163d7cbf98cf Mon Sep 17 00:00:00 2001 From: Takashi Kokubun <takashikkbn@g...> Date: Fri, 16 Aug 2019 01:18:26 +0900 Subject: Make `make update-github` idempotent diff --git a/defs/gmake.mk b/defs/gmake.mk index 2b4716b..981cb77 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -199,7 +199,7 @@ update-github: checkout-github https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L199 $(eval FORK_REPO := $(shell echo $(PULL_REQUEST_FORK_BRANCH) | cut -d' ' -f1)) $(eval PR_BRANCH := $(shell echo $(PULL_REQUEST_FORK_BRANCH) | cut -d' ' -f2)) git merge master --no-edit - git remote add fork-$(PR) git@g...:$(FORK_REPO).git + git remote get-url fork-$(PR) || git remote add fork-$(PR) git@g...:$(FORK_REPO).git git push fork-$(PR) gh-$(PR):$(PR_BRANCH) git remote rm fork-$(PR) -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/