git error on --upgrade now

[Tillerz]

Any quick solution to fix this?

2023-04-29 22:55:46,833 | INFO | X:\automatic\setup.py | Version: d3f0294b Fri Apr 28 22:01:29 2023 -0400
2023-04-29 22:55:47,466 | DEBUG | X:\automatic\setup.py | Setting branch: . / master
2023-04-29 22:55:50,073 | ERROR | X:\automatic\setup.py | Error running git: . / pull origin master --autostash --rebase
2023-04-29 22:55:50,075 | ERROR | X:\automatic\setup.py | Local changes detected: check setup.log for details
2023-04-29 22:55:50,077 | DEBUG | X:\automatic\setup.py | Git output: From https://github.com/vladmandic/automatic
 * branch              master     -> FETCH_HEAD
   d3f0294b..3c410561  master     -> origin/master
Fetching submodule extensions-builtin/multidiffusion-upscaler-for-automatic1111
From https://github.com/pkuliyi2015/multidiffusion-upscaler-for-automatic1111
   5da750b..6931b89  main       -> origin/main
Fetching submodule extensions-builtin/sd-webui-controlnet
From https://github.com/Mikubill/sd-webui-controlnet
   940d4ed..4d4b1f8  main               -> origin/main
   12463b8..0e5fcbd  lllyasviel-patch-1 -> origin/lllyasviel-patch-1
error: Your local changes to the following files would be overwritten by checkout:
	extensions-builtin/multidiffusion-upscaler-for-automatic1111
	extensions-builtin/sd-webui-controlnet
Please commit your changes or stash them before you switch branches.
Aborting
error: could not detach HEAD

I didn't change anything, so I have no idea why it's complaining now.

[vladmandic]

weird, but it reports there are local changes.
you can do

cd X:\automatic
git stash
cd X:\automatic\extensions-builtin/multidiffusion-upscaler-for-automatic1111
git stash
cd X:\automatic\extensions-builtin/sd-webui-controlnet
git stash

and rerun webui

[Tillerz]

That worked, thanks. Even tho that git said there are no changes...

X:\automatic>git stash
No local changes to save

X:\automatic\extensions-builtin\multidiffusion-upscaler-for-automatic1111>git stash
No local changes to save

X:\automatic\extensions-builtin\sd-webui-controlnet>git stash
No local changes to save

Maybe something (that shouldn't) modified a timestamp or whatever git is checking.

[vladmandic]

silly git. sometimes it needs a nudge ;)