diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-04-27 00:40:43 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-04-27 01:04:05 +0900 |
| commit | a217d3cedce3f5aa5c27a1ce6c72b65ec37da057 (patch) | |
| tree | 87e5d246c031c2dd4f5ae966e52126061ded4eaf /common.mk | |
| parent | 33767d1e3d1c7a5dc8eddeefd9c923a8a3dda1e1 (diff) | |
check: compare with right upstream
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -723,8 +723,10 @@ clean-spec: PHONY check: main test test-tool test-all test-spec $(ECHO) check succeeded - -$(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; \ + -$(Q) if [ x"$(GIT)" != x ] && $(CHDIR) "$(srcdir)" && \ + b=`$(GIT) symbolic-ref --short HEAD 2>&1` && \ + u=`$(GIT) branch --list --format='%(upstream:short)' $$b`; then \ + set -x; $(GIT) --no-pager log --format=oneline -G "^ *# *include" $$u..HEAD --; \ fi check-ruby: test test-ruby |