diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-04-25 15:33:05 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-04-25 15:33:05 +0900 |
| commit | 116f91ab504a450b1b96d6b3f029fbaa5f99a305 (patch) | |
| tree | d2da7178fb3d5812a0805e4bfef461c0bdb54312 /defs | |
| parent | 09ce223b0b297359fd7f9a5d629a70be32157302 (diff) | |
| download | ruby-116f91ab504a450b1b96d6b3f029fbaa5f99a305.tar.gz | |
Make working tree under the source directory
Diffstat (limited to 'defs')
| -rw-r--r-- | defs/gmake.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk index 4e0e2330fe..e1ef97f3cc 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -172,10 +172,10 @@ fetch-github: 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 \ |