ran setup.sh

2025-04-18 13:29:38 -07:00
parent b78296ab5b
commit 0674f1ddab
23 changed files with 195 additions and 123 deletions
--- a/scripts/upstream.sh
+++ b/scripts/upstream.sh
@@ -237,7 +237,7 @@ checkout() {
  # Allow directory to be empty
  shopt -s nullglob
  for patch in ../patches/*.patch; do
-    if ! git am --3way "${patch}"; then
+    if ! git am --ignore-whitespace --3way "${patch}"; then
      err_failed_to_apply "$(basename "${patch}")"
    fi
  done