From d77d2bc64e72b1cf270492073dcaeb357e45535b Mon Sep 17 00:00:00 2001
From: Wenxuan Zhao <viz@linux.com>
Date: Tue, 23 Oct 2018 21:27:21 -0700
Subject: [PATCH] =?UTF-8?q?=E7=BB=95=E8=BF=87=E6=A3=80=E6=9F=A5=EF=BC=9A?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=A3=80=E6=9F=A5=20PR=20=E5=A4=96=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=8C=E4=BF=AE=E5=A4=8D=E7=BB=95=E8=BF=87?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/check/collect.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/check/collect.sh b/scripts/check/collect.sh
index db49dacaa6..d58246b120 100644
--- a/scripts/check/collect.sh
+++ b/scripts/check/collect.sh
@@ -14,11 +14,13 @@ echo "[收集] 计算 PR 分支与目标分支的分叉点……"
 TARGET_BRANCH="${TRAVIS_BRANCH:-master}"
 echo "[收集] 目标分支设定为：${TARGET_BRANCH}"
 
-MERGE_BASE="$(git merge-base "$TARGET_BRANCH" FETCH_HEAD)"
+MERGE_BASE='HEAD^'
+[ "$TRAVIS_PULL_REQUEST" != 'false' ] \
+    && MERGE_BASE="$(git merge-base "$TARGET_BRANCH" HEAD)"
 echo "[收集] 找到分叉节点：${MERGE_BASE}"
 
 {
-  git log --oneline "${MERGE_BASE}..FETCH_HEAD" | grep -Eq '^绕过检查：' && {
+  git log --oneline "${MERGE_BASE}..HEAD" | grep -Eq '绕过检查' && {
     touch /tmp/bypass
     echo "[收集] 已标记为绕过检查项"
   }
@@ -26,7 +28,7 @@ echo "[收集] 找到分叉节点：${MERGE_BASE}"
 
 echo "[收集] 写出文件变更列表……"
 
-git diff "$MERGE_BASE" FETCH_HEAD --no-renames --name-status > /tmp/changes
+git diff "$MERGE_BASE" HEAD --no-renames --name-status > /tmp/changes
 echo "[收集] 已写出文件变更列表："
 cat /tmp/changes
 { [ -z "$(cat /tmp/changes)" ] && echo "（无变更）"; } || true