mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-09-14 05:22:24 +00:00
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.
This commit is contained in:
parent
b8854549f2
commit
37bbfc1b38
Notes:
sideshowbarker
2024-07-17 11:07:14 +09:00
Author: https://github.com/gmta
Commit: 37bbfc1b38
Pull-request: https://github.com/SerenityOS/serenity/pull/13988
Reviewed-by: https://github.com/kleinesfilmroellchen ✅
1 changed files with 1 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue