From 19fc6a5d21fa62f607ab6cb765497fdb42312ec7 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Tue, 28 Feb 2017 17:13:53 -0800 Subject: [PATCH] ignore base.go --- staging/copy.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/staging/copy.sh b/staging/copy.sh index 2e2e9f048b6..d036cd720c5 100755 --- a/staging/copy.sh +++ b/staging/copy.sh @@ -223,8 +223,9 @@ rm -rf "${CLIENT_REPO_TEMP}/staging" if [ "${FAIL_ON_CHANGES}" = true ]; then echo "running FAIL_ON_CHANGES" - ret=0 - if diff --ignore-matching-lines='^\s*\"Comment\"' -NauprB -I "GoVersion.*\|GodepVersion.*" "${CLIENT_REPO}" "${CLIENT_REPO_TEMP}"; then + # ignore base.go in diff + cp "${CLIENT_REPO}/pkg/version/base.go" "${CLIENT_REPO_TEMP}/pkg/version/" + if diff -NauprB -I '^\s*\"Comment\"' -I "GoVersion.*\|GodepVersion.*" "${CLIENT_REPO}" "${CLIENT_REPO_TEMP}"; then echo "${CLIENT_REPO} up to date." cleanup exit 0