Ports: Keep [...] prefixes while importing patches

This stops us from mangling our LLVM patch names and titles when using `./package.sh dev`, as they like to put their category names in square brackets.
Author: https://github.com/timschumi Commit: https://github.com/SerenityOS/serenity/commit/4d29489705 Pull-request: https://github.com/SerenityOS/serenity/pull/15268 Reviewed-by: https://github.com/alimpfard ✅ Reviewed-by: https://github.com/gmta
2022-09-16 19:59:41 +02:00 · 2022-09-16 19:59:41 +02:00 · 4d29489705 · 2024-07-17 06:52:57 +09:00
commit 4d29489705
parent e6ef366859
1 changed files with 1 additions and 1 deletions
--- a/Ports/.port_include.sh
+++ b/Ports/.port_include.sh
@ -734,7 +734,7 @@ do_dev() {
                fi

                echo "Importing patch $(basename "${patch}")..."
-                git am --keep-cr "$patch" >/dev/null 2>&1 || {
+                git am --keep-cr --keep-non-patch "$patch" >/dev/null 2>&1 || {
                    git am --abort >/dev/null 2>&1 || true
                    if git apply < $patch; then
                        git add -A