diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-08-12 01:04:21 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-08-12 14:11:41 +0900 |
| commit | 2b3d84d584e4a4cec5fe452db422c76048826c2b (patch) | |
| tree | 70b05037c6f8104be3b4904acdc6e7f9aa0ff8db /defs | |
| parent | b1ad628cdfaef8da8d79d425b5012eb699ff9c1b (diff) | |
| download | ruby-2b3d84d584e4a4cec5fe452db422c76048826c2b.tar.gz | |
Use rev-parse
Use simpler rev-parse to check if pull request was fetched.
Diffstat (limited to 'defs')
| -rw-r--r-- | defs/gmake.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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)" \ ) |