From 4d294897055388a80bc3a5809197642fdd7af03d Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Fri, 16 Sep 2022 19:59:41 +0200 Subject: [PATCH] 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. --- 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 cc100396d4..e94b377e43 100755 --- 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