Merge branch 'next' into master

This commit is contained in:
Frank Denis 2021-02-10 19:46:43 +01:00 committed by GitHub
commit 6f58952d65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -23,7 +23,7 @@ for aux in v3/*.md; do
fi fi
done done
NEW_ENTRIES="new-entries.txt" NEW_ENTRIES="$(pwd)/new-entries.txt"
git fetch --all git fetch --all
git diff origin/master -- v3 | grep -F '+sdns://' | cut -d'+' -f2- | sort >"$NEW_ENTRIES" git diff origin/master -- v3 | grep -F '+sdns://' | cut -d'+' -f2- | sort >"$NEW_ENTRIES"
if [ ! -s "$NEW_ENTRIES" ]; then if [ ! -s "$NEW_ENTRIES" ]; then