Disable auto local branch creation with config option #894
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
|
I think this makes sense. Thanks! |
chooglen
force-pushed
the
push-d50fb2d6c9c1499da78ea446af275342
branch
from
00c3f3a to
930a050
Compare
chooglen
changed the title
|
This would be pretty useful -- chooglen@, would you mind syncing and updating this PR? |
|
Ah, I've been updating this on my end, but haven't had the time to send it out yet. Give me a bit. |
chooglen
force-pushed
the
push-d50fb2d6c9c1499da78ea446af275342
branch
2 times, most recently
from
56624bb to
8358f6d
Compare
|
Okay, I think this is ready for review, PTAL :) |
martinvonz
reviewed
Jan 26, 2023
chooglen
force-pushed
the
push-d50fb2d6c9c1499da78ea446af275342
branch
2 times, most recently
from
08ab346 to
a967923
Compare
We'll add an import test in the next commit.
This test coverage will become more important when we make changes to remote branch importing.
chooglen
force-pushed
the
push-d50fb2d6c9c1499da78ea446af275342
branch
3 times, most recently
from
965a8db to
d02c1a6
Compare
martinvonz
approved these changes
Jan 30, 2023
Add a new git.auto-local-branch config option. When set to false, a remote-tracking branch imported from Git will not automatically create a local branch target. This is implemented by a new GitSettings struct that passes Git-related settings from UserSettings. This behavior is particularly useful in a co-located jj and Git repo, because a Git remote might have branches that are not of everyday interest to the user, so it does not make sense to export them as local branches in Git. E.g. https://github.com/gitster/git, the maintainer's fork of Git, has 379 branches, most of which are topic branches kept around for historical reasons, and Git developers wouldn't be expected to have local branches for each remote-tracking branch.
chooglen
force-pushed
the
push-d50fb2d6c9c1499da78ea446af275342
branch
from
d02c1a6 to
3c1532a
Compare
6 tasks
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.
As a Git developer, my git/git repo has https://github.com/gitster/git as an upstream. Since we create a local jj branch when we import the remote-tracking branches and then subsequently export the local branches to git, my git repo has seen a sudden explosion in the number of local branches.
This attempts to fix the problem by not creating a local branch during import. This workflow might also be desirable to users with certain remote setups that make local branch creation confusing. FWIW I think I'd sometimes like to have the local branch and sometimes not; I find automatic branch creation useful when there's only one remote, but confusing with >= 3 remotes, like my git/git repo.
An alternative solution to the branch proliferation problem would be to create the local branch but don't export it to Git (which would have also been a fix for #493). However, if we take this PR, I don't see a compelling enough reason to make the Git export configurable, especially since having more knobs makes the UX potentially more confusing.
Checklist
If applicable:
CHANGELOG.md