From 51d9d0f8887820ce52234c80d78388b002e6e628 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 11 Aug 2019 15:42:16 +0900 Subject: [PATCH] Use already fetched pull request [ci skip] --- defs/gmake.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/defs/gmake.mk b/defs/gmake.mk index 358916e32f..2a11d457d6 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -177,7 +177,10 @@ define fetch-github git -C "$(srcdir)" remote add github $(GITHUB_RUBY_URL); \ $(eval REMOTE_GITHUB_URL := $(GITHUB_RUBY_URL)) \ ) - git -C "$(srcdir)" fetch -f github "pull/$(1)/head:gh-$(1)" + $(if $(git -C "$(srcdir)" log -1 --oneline "github/pull/$(1)/head" 2> /dev/null), \ + git -C "$(srcdir)" branch -f "gh-$(1)" "github/pull/$(1)/head", \ + git -C "$(srcdir)" fetch -f github "pull/$(1)/head:gh-$(1)" \ + ) endef .PHONY: checkout-github