Skip to content

Allow reading COMMANDLINE_ARGS from file#69

Closed
ghost wants to merge 3 commits intoAUTOMATIC1111:masterfrom
dante-chiesa:master
Closed

Allow reading COMMANDLINE_ARGS from file#69
ghost wants to merge 3 commits intoAUTOMATIC1111:masterfrom
dante-chiesa:master

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Sep 5, 2022

To avoid having custom settings clobbered by merge/pull/etc.

To avoid having custom settings clobbered by merge/pull/etc.
@AUTOMATIC1111
Copy link
Copy Markdown
Owner

Does pulling do that? It's supposed to merge whatever you changed with incoming changes.

GenericPseudonym added 2 commits September 5, 2022 10:22
Don't check for "-" at the beginning or end of strings,
since that wouldn't be a valid "1-10" type numerical range anyways.
@dgrenner
Copy link
Copy Markdown
Contributor

dgrenner commented Sep 8, 2022

Pulling usually gets blocked:

git pull
error: Your local changes to the following files would be overwritten by merge:
        webui.bat
Please commit your changes or stash them before you merge.
Aborting

It can of course be handled by stash / pull / apply stash. But was thinking about something similar myself as to this PR and #140, which is trying to work around the same problem in a different way. But would be good to be able to overwrite the other settings as well (I need the PYTHON path configured as well).

I suggest adding:

if exist webui.settings.bat (
    call webui.settings.bat
)

to line 8 on webui.bat - then users can create that file with whatever overwrites they want. And then add webui.settings.bat to .gitignore. Would need a readme update as well, instructing users to add whatever they want in there. If there are more settings in webui.bat it should be added before, so that also could be modified. If you want @AUTOMATIC1111 I can create a separate PR for that (instead of hijacking this one - sorry for that).

@dgrenner dgrenner mentioned this pull request Sep 8, 2022
@AUTOMATIC1111
Copy link
Copy Markdown
Owner

I merged the other solution adding a more customizable config file.

Sashimimochi pushed a commit to Sashimimochi/stable-diffusion-webui that referenced this pull request Apr 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants