cli: Add a jj git init command.
#2932
Merged
Conversation
This file contains 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
essiene
force-pushed
the
essiene/2747/git_init
branch
from
4daeed2 to
c86b522
Compare
yuja
reviewed
Feb 4, 2024
There was a problem hiding this comment.
- I believe that --colocated doesn't need to go through the same
steps as --git-repo, after the repo is created. Is this correct?
Yes, but you'll need to set up .jj/.gitignore.
- I've kept the current behaviour of
jj init --gitby specifying
colocatedfalse when invoked that way. I don't think it's worth
the effort to add it in. Makes sense?
I don't think we'll need to add new feature to jj init --git.
essiene
force-pushed
the
essiene/2747/git_init
branch
4 times, most recently
from
25feffd to
800ac05
Compare
|
martinvonz
reviewed
Feb 4, 2024
essiene
force-pushed
the
essiene/2747/git_init
branch
2 times, most recently
from
a7fce2a to
85322a8
Compare
PhilipMetzger
approved these changes
Feb 4, 2024
essiene
force-pushed
the
essiene/2747/git_init
branch
from
85322a8 to
d5ad207
Compare
Thanks. I'll wait for a stamp from one of them. |
martinvonz
approved these changes
Feb 5, 2024
essiene
force-pushed
the
essiene/2747/git_init
branch
from
d5ad207 to
dc8ac02
Compare
This initializes a git backed repo. * It does the same thing as `jj init --git` except that it has a --colocated flag to explicitly specify that we want the .git repo to be side-by-side the .jj repo in the working directory. * `jj init --git` will keep the current behaviour and will not be able to create colocated git backed repos. * Update test snapshots.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Implement
jj git initThere are two flags which work as mostly expected.
See
GitInitArgsfor details.Some improvements around
colocatedrepos vs--git-repo=.will come after this PR is merged.The actual delta in this PR is tiny. The only thing new here is hooking up the
jj git initcommand itself and insidegit_inithandling--colocateddifferently.The rest of the PR is test and documentation.
Checklist
If applicable:
CHANGELOG.md