Skip to content

Commit 849db0a

Browse files
authored
Merge pull request kubernetes-csi#8 from pohly/subtree-check-relax
verify-subtree.sh: relax check and ignore old content
2 parents 33d58fd + cc564f9 commit 849db0a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

verify-subtree.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if [ ! "$DIR" ]; then
3030
exit 1
3131
fi
3232

33-
REV=$(git log -n1 --format=format:%H --no-merges -- "$DIR")
33+
REV=$(git log -n1 --remove-empty --format=format:%H --no-merges -- "$DIR")
3434
if [ "$REV" ]; then
3535
echo "Directory '$DIR' contains non-upstream changes:"
3636
echo

0 commit comments

Comments
 (0)