extern/easydiffusion
1
0
Fork 1
mirror of https://github.com/easydiffusion/easydiffusion.git synced 2025-06-24 03:41:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #521 from JeLuF/patch-4

Browse Source 
Add --whitespace=fix to git apply
This commit is contained in:
cmdr2 2022-11-21 12:33:04 +05:30 committed by GitHub
commit d4ce54a3c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/on_sd_start.bat
View File

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

8
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 ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed" git apply --whitespace=fix ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed"
git apply ../ui/sd_internal/env_yaml.patch || fail "yaml patch failed" git apply --whitespace=fix ../ui/sd_internal/env_yaml.patch || fail "yaml patch failed"
cd .. cd ..
else else
@ -46,8 +46,8 @@ else
cd stable-diffusion cd stable-diffusion
git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c
git apply ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed" git apply --whitespace=fix ../ui/sd_internal/ddim_callback.patch || fail "ddim patch failed"
git apply ../ui/sd_internal/env_yaml.patch || fail "yaml patch failed" git apply --whitespace=fix ../ui/sd_internal/env_yaml.patch || fail "yaml patch failed"
cd .. cd ..
fi fi