Nobuyoshi Nakada	2019-04-25 15:33:05 +0900 (Thu, 25 Apr 2019)

  New Revision: 116f91ab50

  https://git.ruby-lang.org/ruby.git/commit/?id=3D116f91ab50

  Log:
    Make working tree under the source directory

  Modified files:
    defs/gmake.mk=
From 116f91ab504a450b1b96d6b3f029fbaa5f99a305 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Thu, 25 Apr 2019 15:33:05 +0900
Subject: Make working tree under the source directory


diff --git a/defs/gmake.mk b/defs/gmake.mk
index 4e0e233..e1ef97f 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -172,10 +172,10 @@ fetch-github: https://github.com/ruby/ruby/blob/trunk/#L172
 merge-github: fetch-github
 	$(eval GITHUB_MERGE_BASE := $(shell git -C "$(srcdir)" log -1 --format=format:%H))
 	$(eval GITHUB_MERGE_BRANCH := $(shell git -C "$(srcdir)" symbolic-ref --short HEAD))
-	$(eval GITHUB_MERGE_WORKTREE := $(shell mktemp -d gh-$(PR)-XXXXXX))
-	git -C "$(srcdir)" worktree add $(GITHUB_MERGE_WORKTREE) "gh-$(PR)"
+	$(eval GITHUB_MERGE_WORKTREE := $(shell mktemp -p "$(srcdir)" -d gh-$(PR)-XXXXXX))
+	git -C "$(srcdir)" worktree add $(notdir $(GITHUB_MERGE_WORKTREE)) "gh-$(PR)"
 	git -C "$(GITHUB_MERGE_WORKTREE)" rebase $(GITHUB_MERGE_BRANCH)
-	git -C "$(srcdir)" worktree remove "$(GITHUB_MERGE_WORKTREE)"
+	git -C "$(srcdir)" worktree remove $(notdir $(GITHUB_MERGE_WORKTREE))
 	git -C "$(srcdir)" merge --ff-only "gh-$(PR)"
 	git -C "$(srcdir)" branch -D "gh-$(PR)"
 	git -C "$(srcdir)" filter-branch -f \
-- 
cgit v0.10.2


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