RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 05:07:35 +00:00
Code Issues Activity Actions

Ports: Improve newline support for ./package.sh dev

Browse source 
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.
This commit is contained in:
Jelle Raaijmakers 2022-05-09 00:59:17 +02:00 • committed by Linus Groh
parent b8854549f2
commit 37bbfc1b38
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ports/.port_include.sh
View file

@ -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