From 37bbfc1b3811e2c547a768bc8b17282786aac234 Mon Sep 17 00:00:00 2001 From: Jelle Raaijmakers Date: Mon, 9 May 2022 00:59:17 +0200 Subject: [PATCH] Ports: Improve newline support for `./package.sh dev` Previously `git am` could fail on patches with Windows line endings (CRLF). By supplying `--keep-cr`, we prevent git from stripping the CR from our patches. --- Ports/.port_include.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ports/.port_include.sh b/Ports/.port_include.sh index a0e504f089..e31a13fc08 100755 --- a/Ports/.port_include.sh +++ b/Ports/.port_include.sh @@ -713,7 +713,7 @@ do_dev() { fi echo "Importing patch $patch..." - git am "$patch" >/dev/null 2>&1 || { + git am --keep-cr "$patch" >/dev/null 2>&1 || { git am --abort >/dev/null 2>&1 || true if git apply < $patch; then git add -A