mirror of
https://github.com/easydiffusion/easydiffusion.git
synced 2024-11-25 09:44:25 +01:00
Warn but don't fix whitespaces in a patch
This commit is contained in:
parent
927fd304b0
commit
daaa65dc0a
@ -39,7 +39,7 @@ if exist "Open Developer Console.cmd" del "Open Developer Console.cmd"
|
||||
@call git pull
|
||||
@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 ..
|
||||
) else (
|
||||
@ -56,7 +56,7 @@ if exist "Open Developer Console.cmd" del "Open Developer Console.cmd"
|
||||
@cd stable-diffusion
|
||||
@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 ..
|
||||
)
|
||||
|
@ -32,7 +32,7 @@ if [ -e "scripts/install_status.txt" ] && [ `grep -c sd_git_cloned scripts/insta
|
||||
git pull
|
||||
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 ..
|
||||
else
|
||||
@ -47,7 +47,7 @@ else
|
||||
cd stable-diffusion
|
||||
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 ..
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user