From 3bf5e11f94b9e71ff124a9df6660444603dea9e6 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Mon, 21 Nov 2022 17:19:55 +0530 Subject: [PATCH] Nowarn for fresh installation (git apply whitespace) --- 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 6f5ab212..1acb7b3a 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -55,8 +55,8 @@ if exist "Open Developer Console.cmd" del "Open Developer Console.cmd" @cd stable-diffusion @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 .. ) diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index 903e7e44..7745855a 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -46,8 +46,8 @@ else cd stable-diffusion 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 .. fi