From 2b3d84d584e4a4cec5fe452db422c76048826c2b Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 12 Aug 2019 01:04:21 +0900 Subject: Use rev-parse Use simpler rev-parse to check if pull request was fetched. --- defs/gmake.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'defs') diff --git a/defs/gmake.mk b/defs/gmake.mk index 5b6c627930..b681c7234c 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -177,7 +177,7 @@ define fetch-github 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 v1.2.3