extern/easydiffusion
1
0
Fork 1
mirror of https://github.com/easydiffusion/easydiffusion.git synced 2024-12-28 09:59:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't warn about whitespace in the git patch application

Browse Source
This commit is contained in:
cmdr2 2022-11-21 17:11:38 +05:30
parent 888c637f71
commit 1cc27e524b
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

@ -37,8 +37,8 @@ if exist "Open Developer Console.cmd" del "Open Developer Console.cmd"
@call git pull @call git pull
@call git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c @call git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c
@call git apply --whitespace=fix ..\ui\sd_internal\ddim_callback.patch @call git apply --whitespace=nowarn ..\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\env_yaml.patch
@cd .. @cd ..
) else ( ) else (

4
scripts/on_sd_start.sh
View File

@ -30,8 +30,8 @@ if [ -e "scripts/install_status.txt" ] && [ `grep -c sd_git_cloned scripts/insta
git pull git pull
git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c
git apply --whitespace=fix ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed" git apply --whitespace=nowarn ../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/env_yaml.patch || fail "yaml patch failed"
cd .. cd ..
else else