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

ruby-changes:56944

From: Nobuyoshi <ko1@a...>
Date: Mon, 12 Aug 2019 14:14:32 +0900 (JST)
Subject: [ruby-changes:56944] Nobuyoshi Nakada: 2b3d84d584 (master): Use rev-parse

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

From 2b3d84d584e4a4cec5fe452db422c76048826c2b Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Mon, 12 Aug 2019 01:04:21 +0900
Subject: Use rev-parse

Use simpler rev-parse to check if pull request was fetched.

diff --git a/defs/gmake.mk b/defs/gmake.mk
index 5b6c627..b681c72 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -177,7 +177,7 @@ 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)) \
 	)
-	$(if $(git -C "$(srcdir)" log -1 --oneline "github/pull/$(1)/head" 2> /dev/null), \
+	$(if $(git -C "$(srcdir)" rev-parse "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)" \
 	)
-- 
cgit v0.10.2


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

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