summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2019-11-23 16:00:39 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2019-11-23 16:06:30 +0900
commitb563439274a402e33541f5695b1bfd4ac1085638 (patch)
treeda32bc3ac06be4ce665d468835570d8beea75875
parent9318e1ff3e700250dba277924672634c6ecf2940 (diff)
Show include directive differences only when under gitv2_7_0_preview3
When building from tarballs, the source directory is not a git repository.
-rw-r--r--common.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/common.mk b/common.mk
index 018280b4d8..dceeeabd48 100644
--- a/common.mk
+++ b/common.mk
@@ -723,7 +723,9 @@ clean-spec: PHONY
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