https://git.ruby-lang.org/ruby.git/commit/?id=409ce8c3da

From 409ce8c3da966ac8fb809bc6317990f2b5b6479d Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Fri, 16 Aug 2019 01:51:22 +0900
Subject: Also clean up branch for worktree


diff --git a/defs/gmake.mk b/defs/gmake.mk
index 231977d..baea0dc 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -206,7 +206,8 @@ update-github: fetch-github https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L206
 	git -C "$(srcdir)" remote add fork-$(PR) git@g...:$(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 v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/