diff options
| author | Takashi Kokubun <takashikkbn@gmail.com> | 2019-08-16 01:18:26 +0900 |
|---|---|---|
| committer | Takashi Kokubun <takashikkbn@gmail.com> | 2019-08-16 01:18:28 +0900 |
| commit | 789f17665e87ddfe76ef2f7bf344163d7cbf98cf (patch) | |
| tree | f28b5933fe48f87345e1e734166b07a68756a206 /defs | |
| parent | d013d8e02e895e08f7feb0977c0ea88e6f00b580 (diff) | |
Make `make update-github` idempotent
Diffstat (limited to 'defs')
| -rw-r--r-- | defs/gmake.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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) |