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

ruby-changes:58894

From: Nobuyoshi <ko1@a...>
Date: Sat, 23 Nov 2019 16:08:05 +0900 (JST)
Subject: [ruby-changes:58894] b563439274 (master): Show include directive differences only when under git

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

From b563439274a402e33541f5695b1bfd4ac1085638 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sat, 23 Nov 2019 16:00:39 +0900
Subject: Show include directive differences only when under git

When building from tarballs, the source directory is not a git
repository.

diff --git a/common.mk b/common.mk
index 018280b..dceeeab 100644
--- a/common.mk
+++ b/common.mk
@@ -723,7 +723,9 @@ clean-spec: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L723
 
 check: main test test-tool test-all test-spec
 	$(ECHO) check succeeded
-	- $(GIT) --no-pager -C "$(srcdir)" log --format=oneline -G "^ *# *include" origin/master..HEAD
+	-$(Q) if [ x"$(GIT)" != x ] && $(CHDIR) "$(srcdir)" && $(GIT) rev-parse > /dev/null 2>&1; then \
+	  set -x; $(GIT) --no-pager log --format=oneline -G "^ *# *include" origin/master..HEAD; \
+	fi
 check-ruby: test test-ruby
 
 fake: $(CROSS_COMPILING)-fake
-- 
cgit v0.10.2


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

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