Merge commit 'c60f3823c09a501b1cc12b97b20eb05cec9f822e' into prow

2019-04-11 11:08:47 +02:00
parent 944be888d8 c60f3823c0
commit 7cb8471e93
9 changed files with 1511 additions and 2 deletions
--- a/release-tools/verify-subtree.sh
+++ b/release-tools/verify-subtree.sh
@@ -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