diff options
| author | Takashi Kokubun <takashikkbn@gmail.com> | 2019-08-16 01:51:22 +0900 |
|---|---|---|
| committer | Takashi Kokubun <takashikkbn@gmail.com> | 2019-08-16 01:51:22 +0900 |
| commit | 409ce8c3da966ac8fb809bc6317990f2b5b6479d (patch) | |
| tree | 264f5592197697ae3b5d0e2574b2d39b6e5f572c /defs | |
| parent | d21616eeb0616095bb96408036a7548a30987e02 (diff) | |
| download | ruby-409ce8c3da966ac8fb809bc6317990f2b5b6479d.tar.gz | |
Also clean up branch for worktree
Diffstat (limited to 'defs')
| -rw-r--r-- | defs/gmake.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk index 231977d599..baea0dc02f 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -206,7 +206,8 @@ update-github: fetch-github git -C "$(srcdir)" remote add fork-$(PR) git@github.com:$(FORK_REPO).git git -C "$(GITHUB_UPDATE_WORKTREE)" push fork-$(PR) gh-$(PR):$(PR_BRANCH) git -C "$(srcdir)" remote rm fork-$(PR) - git -C "$(srcdir)" worktree remove --force $(GITHUB_UPDATE_WORKTREE) + git -C "$(srcdir)" worktree remove $(notdir $(GITHUB_UPDATE_WORKTREE)) + git -C "$(srcdir)" branch -D gh-$(PR) .PHONY: pull-github pull-github: fetch-github |