Skip to content

Commit

Permalink
Merge pull request kubernetes-csi#8 from pohly/subtree-check-relax
Browse files Browse the repository at this point in the history
verify-subtree.sh: relax check and ignore old content
  • Loading branch information
k8s-ci-robot authored Mar 6, 2019
2 parents 33d58fd + cc564f9 commit 849db0a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion verify-subtree.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 849db0a

Please sign in to comment.