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

verify-subtree.sh: relax check and ignore old content
jsafrane · Mar 6, 2019 · 849db0a · 849db0a
2 parents 33d58fd + cc564f9
commit 849db0a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/verify-subtree.sh b/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