[前][次][番号順一覧][スレッド一覧]

ruby-changes:57056

From: Takashi <ko1@a...>
Date: Fri, 16 Aug 2019 01:45:27 +0900 (JST)
Subject: [ruby-changes:57056] Takashi Kokubun: d21616eeb0 (master): Clean up temporary git resources

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

From d21616eeb0616095bb96408036a7548a30987e02 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Fri, 16 Aug 2019 01:45:00 +0900
Subject: Clean up temporary git resources

after `make update-github`

diff --git a/defs/gmake.mk b/defs/gmake.mk
index 2436d37..231977d 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -203,8 +203,10 @@ update-github: fetch-github https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L203
 	git -C "$(srcdir)" worktree add $(notdir $(GITHUB_UPDATE_WORKTREE)) "gh-$(PR)"
 	git -C "$(GITHUB_UPDATE_WORKTREE)" merge master --no-edit
 	@$(BASERUBY) -e 'print "Are you sure to push this to PR=$(PR)? [Y/n]: "; exit(gets.chomp == "n" ? 1 : 0)'
-	git -C "$(GITHUB_UPDATE_WORKTREE)" remote add fork-$(PR) git@g...:$(FORK_REPO).git
+	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)
 
 .PHONY: pull-github
 pull-github: fetch-github
-- 
cgit v0.10.2


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

[前][次][番号順一覧][スレッド一覧]