From 409ce8c3da966ac8fb809bc6317990f2b5b6479d Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Fri, 16 Aug 2019 01:51:22 +0900 Subject: Also clean up branch for worktree --- defs/gmake.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'defs') 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 -- cgit v1.2.3