ruby-changes:56931
From: Nobuyoshi <ko1@a...>
Date: Sun, 11 Aug 2019 16:12:04 +0900 (JST)
Subject: [ruby-changes:56931] Nobuyoshi Nakada: 51d9d0f888 (master): Use already fetched pull request [ci skip]
https://git.ruby-lang.org/ruby.git/commit/?id=51d9d0f888 From 51d9d0f8887820ce52234c80d78388b002e6e628 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Sun, 11 Aug 2019 15:42:16 +0900 Subject: Use already fetched pull request [ci skip] diff --git a/defs/gmake.mk b/defs/gmake.mk index 358916e..2a11d45 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -177,7 +177,10 @@ define fetch-github https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L177 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 -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/