diff --git a/scripts/verify_genproto.sh b/scripts/verify_genproto.sh
index 0b0d3b900..a66875657 100755
--- a/scripts/verify_genproto.sh
+++ b/scripts/verify_genproto.sh
@@ -6,14 +6,22 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+tmpWorkDir=$(mktemp -d -t 'twd.XXXXXX')
+mkdir "$tmpWorkDir/etcd"
+tmpWorkDir="$tmpWorkDir/etcd"
+cp -r . "$tmpWorkDir"
+pushd "$tmpWorkDir"
+git add -A
+git commit -m init || true # maybe fail because nothing to commit 
 ./scripts/genproto.sh
-diff=$(git diff --name-only | grep -c ".pb.")
-if [ "$diff" -eq 0 ]; then
+diff=$(git diff --numstat | awk '{print $3}')
+popd
+if [ -z "$diff" ]; then
   echo "PASSED genproto-verification!"
   exit 0
 fi
 echo "Failed genproto-verification!" >&2
-echo "* Found changed files $(git diff --name-only | grep '.pb.')" >&2
+printf "* Found changed files:\n%s\n" "$diff" >&2
 echo "* Please rerun genproto.sh after changing *.proto file" >&2
 echo "* Run ./scripts/genproto.sh" >&2
 exit 1