From 1cc27e524b18c3296efd63b82167b54133c3629c Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Mon, 21 Nov 2022 17:11:38 +0530 Subject: [PATCH] Don't warn about whitespace in the git patch application --- scripts/on_sd_start.bat | 4 ++-- scripts/on_sd_start.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index 79a51205..c0fe4a64 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -37,8 +37,8 @@ if exist "Open Developer Console.cmd" del "Open Developer Console.cmd" @call git pull @call git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c - @call git apply --whitespace=fix ..\ui\sd_internal\ddim_callback.patch - @call git apply --whitespace=fix ..\ui\sd_internal\env_yaml.patch + @call git apply --whitespace=nowarn ..\ui\sd_internal\ddim_callback.patch + @call git apply --whitespace=nowarn ..\ui\sd_internal\env_yaml.patch @cd .. ) else ( diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index a4f92428..903e7e44 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -30,8 +30,8 @@ if [ -e "scripts/install_status.txt" ] && [ `grep -c sd_git_cloned scripts/insta git pull git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c - git apply --whitespace=fix ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed" - git apply --whitespace=fix ../ui/sd_internal/env_yaml.patch || fail "yaml patch failed" + git apply --whitespace=nowarn ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed" + git apply --whitespace=nowarn ../ui/sd_internal/env_yaml.patch || fail "yaml patch failed" cd .. else