Merge pull request #8 from pohly/subtree-check-relax

verify-subtree.sh: relax check and ignore old content
This commit is contained in:
Kubernetes Prow Robot 2019-03-06 09:22:50 -08:00 committed by GitHub
commit 849db0ad23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -30,7 +30,7 @@ if [ ! "$DIR" ]; then
exit 1
fi
REV=$(git log -n1 --format=format:%H --no-merges -- "$DIR")
REV=$(git log -n1 --remove-empty --format=format:%H --no-merges -- "$DIR")
if [ "$REV" ]; then
echo "Directory '$DIR' contains non-upstream changes:"
echo