From b5671381709d95f9795db3ed568bc0d72570f5d4 Mon Sep 17 00:00:00 2001
From: Ryo Onodera <ryoqun@gmail.com>
Date: Sun, 14 Jun 2020 23:41:48 +0900
Subject: [PATCH] Use git diff instead of git show for --check (#10566)
 (#10568)

automerge
---
 ci/test-sanity.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/test-sanity.sh b/ci/test-sanity.sh
index 00ce062eb1..6c9c17749c 100755
--- a/ci/test-sanity.sh
+++ b/ci/test-sanity.sh
@@ -6,7 +6,7 @@ cd "$(dirname "$0")/.."
 source ci/_
 
 (
-  echo --- git show --check
+  echo --- git diff --check
   set -x
   # Look for failed mergify.io backports by searching leftover conflict markers
   # Also check for any trailing whitespaces!
@@ -16,7 +16,7 @@ source ci/_
     base_branch=$BUILDKITE_BRANCH
   fi
   git fetch origin "$base_branch"
-  git show "$(git merge-base HEAD "origin/$base_branch")..HEAD" --check --oneline
+  git diff "$(git merge-base HEAD "origin/$base_branch")..HEAD" --check --oneline
 )
 
 echo