Allow listing and resolving @git branches
#1687
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
ilyagr
force-pushed
the
branch-list-git
branch
3 times, most recently
from
02b3f15
to
93324cc
Compare
ilyagr
force-pushed
the
branch-list-git
branch
3 times, most recently
from
1a43ac4
to
9ed991c
Compare
martinvonz
reviewed
Jun 12, 2023
ilyagr
force-pushed
the
branch-list-git
branch
7 times, most recently
from
83c7f75
to
95e2dc5
Compare
3 tasks
martinvonz
approved these changes
Jun 12, 2023
This doesn't change the way @git branches are stored in `git_refs` as opposed to inside `BranchTarget` like normal remote-tracking branches. There are subtle differences in behavior with e.g. `jj branch forget` and I'm not sure how easy it is to rewrite `jj git import/export` to support a different way of storage. I've decided to call these "local-git tracking branches" since they track branches in the local git repository. "local git-tracking" branches sounds a bit more natural, but these could be confused with there are no remote git-tracking branches. If one had the idea these might exist, they would be confused with remote-tracking branches in the local git repo. This addresses a portion of martinvonz#1666
Use `br@git` instead. Before, if there is not a local branch `br`, jj tried to resolve it as a git ref `refs/heads/br`. Unchanged from before, `br` can still be resolved as a tag `refs/tag/br`.
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.
Also demos
jj branch forgetbehavior with git-tracking branches.This addresses a portion of #1666 and also includes a commit describing
some nuanced behavior of
jj branch forgetin a test.Checklist
If applicable:
CHANGELOG.md