From 789f17665e87ddfe76ef2f7bf344163d7cbf98cf Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Fri, 16 Aug 2019 01:18:26 +0900 Subject: Make `make update-github` idempotent --- defs/gmake.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'defs') diff --git a/defs/gmake.mk b/defs/gmake.mk index 2b4716b547..981cb77e15 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -199,7 +199,7 @@ update-github: checkout-github $(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@github.com:$(FORK_REPO).git + git remote get-url fork-$(PR) || git remote add fork-$(PR) git@github.com:$(FORK_REPO).git git push fork-$(PR) gh-$(PR):$(PR_BRANCH) git remote rm fork-$(PR) -- cgit v1.2.3