[Issue]: Error after performing a git pull (Update)

PayLater666 commented 10 months ago

Issue Description

When I check for updates on GitHub, I run the command "git pull." However, when I execute webui.bat and webui-user.bat, I encounter the error message "Error running git: None / submodule --quiet update --init --recursive." I don't understand why I always get errors with every update. Can you provide a default script for a safe update so I can have peace of mind? liike update.bat in automatic folder

Version Platform Description

No response

Relevant log output

2023-09-07 22:18:58,368 | sd | INFO | webui | Launching browser
2023-09-07 22:24:17,824 | sd | INFO | launch | Starting SD.Next
2023-09-07 22:24:17,839 | sd | INFO | installer | Python 3.10.11 on Windows
2023-09-07 22:24:17,914 | sd | INFO | installer | Version: 81ff379e Thu Sep 7 09:38:35 2023 -0400
2023-09-07 22:24:18,602 | sd | DEBUG | installer | Setting environment tuning
2023-09-07 22:24:18,603 | sd | DEBUG | installer | Torch overrides: cuda=False rocm=False ipex=False diml=False openvino=False
2023-09-07 22:24:18,603 | sd | DEBUG | installer | Torch allowed: cuda=True rocm=True ipex=True diml=True openvino=True
2023-09-07 22:24:18,605 | sd | INFO | installer | nVidia CUDA toolkit detected
2023-09-07 22:24:18,853 | sd | DEBUG | installer | Repository update time: Thu Sep  7 20:38:35 2023
2023-09-07 22:24:18,854 | sd | DEBUG | installer | Previous setup time: Mon Sep  4 21:27:17 2023
2023-09-07 22:24:18,854 | sd | INFO | installer | Disabled extensions: []
2023-09-07 22:24:18,857 | sd | INFO | installer | Enabled extensions-builtin: ['a1111-sd-webui-lycoris', 'clip-interrogator-ext', 'LDSR', 'Lora', 'multidiffusion-upscaler-for-automatic1111', 'ScuNET', 'sd-extension-system-info', 'sd-webui-agent-scheduler', 'sd-webui-controlnet', 'stable-diffusion-webui-images-browser', 'stable-diffusion-webui-rembg', 'SwinIR']
2023-09-07 22:24:18,865 | sd | INFO | installer | Enabled extensions: ['a1111-sd-webui-tagcomplete', 'adetailer', 'sd-dynamic-prompts', 'sd-webui-depth-lib', 'sd-webui-supermerger', 'sd_webui_SAG', 'ultimate-upscale-for-automatic1111']
2023-09-07 22:24:18,872 | sd | DEBUG | installer | Latest extensions time: Thu Sep  7 22:17:48 2023
2023-09-07 22:24:18,872 | sd | DEBUG | installer | Timestamps: version:1694093915 setup:1693837637 extension:1694099868
2023-09-07 22:24:18,872 | sd | INFO | installer | Verifying requirements
2023-09-07 22:24:18,901 | sd | INFO | installer | Verifying packages
2023-09-07 22:24:18,906 | sd | INFO | installer | Verifying repositories
2023-09-07 22:24:19,037 | sd | DEBUG | installer | Submodule: D:\AI\automatic\repositories\stable-diffusion-stability-ai / main
2023-09-07 22:24:20,587 | sd | DEBUG | installer | Submodule: D:\AI\automatic\repositories\taming-transformers / master
2023-09-07 22:24:24,641 | sd | DEBUG | installer | Submodule: D:\AI\automatic\repositories\BLIP / main
2023-09-07 22:24:25,973 | sd | INFO | installer | Verifying submodules
2023-09-07 22:24:31,055 | sd | ERROR | installer | Error running git: None / submodule --quiet update --init --recursive
2023-09-07 22:24:31,058 | sd | ERROR | installer | Local changes detected: check log for details: D:\AI\automatic\sdnext.log
2023-09-07 22:24:31,060 | sd | DEBUG | installer | Git output: error: Your local changes to the following files would be overwritten by checkout:
    models/control_v11f1e_sd15_tile.yaml
Please commit your changes or stash them before you switch branches.
Aborting
fatal: Unable to checkout '2b12b2760dcde0e29c0d33640739ba3fe2c0cd32' in submodule path 'extensions-builtin/sd-webui-controlnet'

Backend

Original

Model

SD 1.5

Acknowledgements

[X] I have read the above and searched for existing issues
[X] I confirm that this is classified correctly and its not an extension issue

vladmandic commented 10 months ago

you don't need git pull and definitely don't need update.bat, full upgrade functionality is built-in for a loooong time, just run webui --upgrade. you made some assumptions in your message that just don't hold.

and error message is pretty clear - models/control_v11f1e_sd15_tile.yaml this file should not be there and its preventing upgrades as git detects it as change to repo and aborts.

PayLater666 commented 10 months ago

Wow, thanks

vladmandic / automatic