Skip to content

Support running as a git submodule.#5227

Merged
oobabooga merged 22 commits intooobabooga:devfrom
acdvorak:fix/git-submodule
Jan 27, 2024
Merged

Support running as a git submodule.#5227
oobabooga merged 22 commits intooobabooga:devfrom
acdvorak:fix/git-submodule

Conversation

@acdvorak
Copy link
Copy Markdown
Contributor

Allow text-generation-webui to run as a git submodule within a parent git repo.

In standalone git repos, .git is a directory; in submodules, .git is a text file containing a pointer to the commit SHA.

This PR simply checks whether .git exists instead of requiring it to be a directory, and explicitly specifies the remote and branch names when pulling.

Checklist:

oobabooga and others added 22 commits December 14, 2023 22:39
Allow `text-generation-webui` to run as a git submodule within a parent git repo.

In standalone git repos, `.git` is a _directory_; in submodules, `.git` is a _text file_ containing a pointer to the commit SHA.

This PR simply checks whether `.git` exists instead of requiring it to be a directory, and explicitly specifies the remote and branch names when pulling.
@oobabooga oobabooga merged commit 5e87678 into oobabooga:dev Jan 27, 2024
@orlandov
Copy link
Copy Markdown

orlandov commented Jan 28, 2024

Is it intended for the one_click.py script's remote and branch to be hardcoded to refer origin and main respectively? There's no guarantee the user's remote is named origin and they may be on a branch other than main (for instance, I like to follow dev). Having the script try to rebase main when one is on dev seems... surprising. Previously it would work regardless of the of what branch or upstream the local repo was set to.

A consequence of this change is that one_click.py now complains about rebase errors as a result of being unable to reconcile changes between dev and main (in my case.)

@oobabooga
Copy link
Copy Markdown
Owner

Yes, I think it's better to remove that part. I have done that here d921f80

PoetOnTheRun pushed a commit to PoetOnTheRun/text-generation-webui that referenced this pull request Feb 22, 2024
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.

3 participants