cli: error when inside a git repo inside of a jj repo#9154
Draft
Benjamin-Davies wants to merge 1 commit intojj-vcs:mainfrom
Draft
cli: error when inside a git repo inside of a jj repo#9154Benjamin-Davies wants to merge 1 commit intojj-vcs:mainfrom
Benjamin-Davies wants to merge 1 commit intojj-vcs:mainfrom
Conversation
When the user is inside a Git repo that is itself inside of a JJ repo, there's a fairly good chance that the user intended to act on the inner repo and didn't realise it wasn't colocated with a JJ repo yet. This change modifies `find_workspace_dir` to also return Git repos and adds a new error hint to be shown in this nested repos situation.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When the user is inside a Git repo that is itself inside of a JJ repo, there's a fairly good chance that the user intended to act on the inner repo and didn't realise it wasn't colocated with a JJ repo yet. This change modifies
find_workspace_dirto also return Git repos and adds a new error hint to be shown in this nested repos situation.Checklist
If applicable:
CHANGELOG.mdI have updated the documentation (README.md,docs/,demos/)I have updated the config schema (cli/src/config-schema.json)how it works, how it's organized), including any code drafted by an LLM.
an eye towards deleting anything that is irrelevant, clarifying anything
that is confusing, and adding details that are relevant. This includes,
for example, commit descriptions, PR descriptions, and code comments.