extern/easydiffusion
1
0
Fork 1
mirror of https://github.com/easydiffusion/easydiffusion.git synced 2024-11-25 17:55:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Warn but don't fix whitespaces in a patch

Browse Source
This commit is contained in:
cmdr2 2022-11-22 23:20:24 +05:30
parent 927fd304b0
commit daaa65dc0a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/on_sd_start.bat
View File

@ -39,7 +39,7 @@ if exist "Open Developer Console.cmd" del "Open Developer Console.cmd"
@call git pull @call git pull
@call git -c advice.detachedHead=false checkout 7f32368ed1030a6e710537047bacd908adea183a @call git -c advice.detachedHead=false checkout 7f32368ed1030a6e710537047bacd908adea183a
@call git apply --whitespace=fix ..\ui\sd_internal\ddim_callback.patch @call git apply --whitespace=warn ..\ui\sd_internal\ddim_callback.patch
@cd .. @cd ..
) else ( ) else (
@ -56,7 +56,7 @@ if exist "Open Developer Console.cmd" del "Open Developer Console.cmd"
@cd stable-diffusion @cd stable-diffusion
@call git -c advice.detachedHead=false checkout 7f32368ed1030a6e710537047bacd908adea183a @call git -c advice.detachedHead=false checkout 7f32368ed1030a6e710537047bacd908adea183a
@call git apply --whitespace=fix ..\ui\sd_internal\ddim_callback.patch @call git apply --whitespace=warn ..\ui\sd_internal\ddim_callback.patch
@cd .. @cd ..
) )

4
scripts/on_sd_start.sh
View File

@ -32,7 +32,7 @@ if [ -e "scripts/install_status.txt" ] && [ `grep -c sd_git_cloned scripts/insta
git pull git pull
git -c advice.detachedHead=false checkout 7f32368ed1030a6e710537047bacd908adea183a git -c advice.detachedHead=false checkout 7f32368ed1030a6e710537047bacd908adea183a
git apply --whitespace=fix ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed" git apply --whitespace=warn ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed"
cd .. cd ..
else else
@ -47,7 +47,7 @@ else
cd stable-diffusion cd stable-diffusion
git -c advice.detachedHead=false checkout 7f32368ed1030a6e710537047bacd908adea183a git -c advice.detachedHead=false checkout 7f32368ed1030a6e710537047bacd908adea183a
git apply --whitespace=fix ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed" git apply --whitespace=warn ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed"
cd .. cd ..
fi fi