From f5912f363311e1a7f41d02bc282e785b464455eb Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Sun, 14 Jun 2020 21:16:19 +0900 Subject: [PATCH] Clean up test-sanity.sh a bit (#10565) --- ci/test-sanity.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ci/test-sanity.sh b/ci/test-sanity.sh index b67322b29..00ce062eb 100755 --- a/ci/test-sanity.sh +++ b/ci/test-sanity.sh @@ -5,9 +5,8 @@ cd "$(dirname "$0")/.." source ci/_ -echo --- prepare git show --check - ( + echo --- git show --check set -x # Look for failed mergify.io backports by searching leftover conflict markers # Also check for any trailing whitespaces! @@ -16,10 +15,12 @@ echo --- prepare git show --check else base_branch=$BUILDKITE_BRANCH fi - _ git fetch origin "$base_branch" - _ git show "$(git merge-base HEAD "origin/$base_branch")..HEAD" --check --oneline + git fetch origin "$base_branch" + git show "$(git merge-base HEAD "origin/$base_branch")..HEAD" --check --oneline ) +echo + _ ci/nits.sh _ ci/check-ssh-keys.sh