From 5e87678fead985ad88c3a00d0b833067fb3bcb60 Mon Sep 17 00:00:00 2001 From: "Andrew C. Dvorak" Date: Sat, 27 Jan 2024 14:18:50 -0600 Subject: [PATCH] Support running as a git submodule. (#5227) --- one_click.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/one_click.py b/one_click.py index 86d97c6e..ef3fba7e 100644 --- a/one_click.py +++ b/one_click.py @@ -257,7 +257,7 @@ def install_webui(): def update_requirements(initial_installation=False): # Create .git directory if missing - if not os.path.isdir(os.path.join(script_dir, ".git")): + if not os.path.exists(os.path.join(script_dir, ".git")): git_creation_cmd = 'git init -b main && git remote add origin https://github.com/oobabooga/text-generation-webui && git fetch && git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main && git reset --hard origin/main && git branch --set-upstream-to=origin/main' run_cmd(git_creation_cmd, environment=True, assert_success=True) @@ -268,7 +268,7 @@ def update_requirements(initial_installation=False): ] before_pull_hashes = {file_name: calculate_file_hash(file_name) for file_name in files_to_check} - run_cmd("git pull --autostash", assert_success=True, environment=True) + run_cmd("git pull --autostash origin main", assert_success=True, environment=True) after_pull_hashes = {file_name: calculate_file_hash(file_name) for file_name in files_to_check} # Check for differences in installation file hashes