forked from extern/easydiffusion
2b1f8533b0
For some users who have git preinstalled, `git apply` fails due to whitespace errors. Aracon found that applying `--whitespace=fix` to the `git apply` invocation fixes the problem. https://discord.com/channels/1014774730907209781/1036679816713359471/1037025435491516548 ryz confirmed that `--reject` wasn't needed for him to make it work, and this explanation from the "git apply" manpage suggests that we shouldn't include `--reject`: > For atomicity, git apply by default fails the whole patch and does not touch the working tree when some > of the hunks do not apply. This option makes it apply the parts of the patch that are applicable, and leave > the rejected hunks in corresponding *.rej files. After having a look at https://github.com/git/git/blob/master/apply.c, I think that they only check for `correct_ws_error` if they couldn't apply the patch. It doesn't impact 'normal' patching. If the patch can be applied, it will be done, and only if the apply fails, they'll check whether adding or removing WS might help. It should thus be save to be added and didn't produce any errors on my installation using SDUI-provided git. |
||
|---|---|---|
| .. | ||
| bootstrap.bat | ||
| bootstrap.sh | ||
| Developer Console.cmd | ||
| developer_console.sh | ||
| functions.sh | ||
| on_env_start.bat | ||
| on_env_start.sh | ||
| on_sd_start.bat | ||
| on_sd_start.sh | ||
| post_activate.bat | ||
| post_activate.sh | ||
| Start Stable Diffusion UI.cmd | ||
| start.sh | ||
| win_enable_long_filepaths.ps1 | ||