diff --git a/test/lint/commit-script-check.sh b/test/lint/commit-script-check.sh index cfe310bee0..04bc2f82e3 100755 --- a/test/lint/commit-script-check.sh +++ b/test/lint/commit-script-check.sh @@ -23,7 +23,7 @@ PREV_HEAD=`git rev-parse HEAD` for i in `git rev-list --reverse $1`; do if git rev-list -n 1 --pretty="%s" $i | grep -q "^scripted-diff:"; then git checkout --quiet $i^ || exit - SCRIPT="`git rev-list --format=%b -n1 $i | sed '/^-BEGIN VERIFY SCRIPT-$/,/^-END VERIFY SCRIPT-$/{//!b};d'`" + SCRIPT="`git rev-list --format=%b -n1 $i | sed 's/\r$//;/^-BEGIN VERIFY SCRIPT-$/,/^-END VERIFY SCRIPT-$/{//!b};d'`" if test "x$SCRIPT" = "x"; then echo "Error: missing script for: $i" echo "Failed"