mirror of
https://github.com/easydiffusion/easydiffusion.git
synced 2024-11-25 09:44:25 +01:00
Don't warn about whitespace in the git patch application
This commit is contained in:
parent
c3bf767024
commit
8316a002da
@ -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 (
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user