cli: push new non-tracking bookmarks by default, rename --allow-new flag - #5173
Closed
yuja wants to merge 1 commit into
Closed
cli: push new non-tracking bookmarks by default, rename --allow-new flag#5173yuja wants to merge 1 commit into
yuja wants to merge 1 commit into
Conversation
This partially reverts 296961c "cli: git push: do not push new bookmarks by default." Apparently, the restriction introduced by that patch was too strict for some use cases. The new rule is that any non-tracking (or local-only) bookmarks will be pushed to new remote by default, but --allow-new-tracking is required if a bookmark is already tracking other (real) remotes. Closes jj-vcs#5094
|
Will it be possible to not push some bookmarks without needing to specify |
Contributor
Author
New non-tracking bookmarks within the default push revsets? no. If you like the current |
Contributor
Author
|
I'll leave this open for a while because of #5094 (comment). I don't want to introduce breaking change again. |
Contributor
Makes sense. I think we're too close to the release to merge this now. The release is planned for Wednesday, but I'm not sure I'll get around to it since I'm on vacation. |
yuja
added a commit
to yuja/jj
that referenced
this pull request
Jan 14, 2025
…y default This goes against our rule that we shouldn't add config knob that changes the command behavior, but I don't have any other idea to work around the problem. Apparently, there are two parties, one who always wants to push new bookmarks, and the other who mildly prefers to push&track new bookmarks explicitly. Perhaps, for the former, creation of bookmarks means that the target branches are marked to be pushed. The added flag is a simple boolean. "non-tracking-only" behavior jj-vcs#5173 could be implemented, but I don't want to complicate things. It's a failed attempt to address the issue without introducing config knob. Closes jj-vcs#5094 Closes jj-vcs#5173
github-merge-queue Bot
pushed a commit
that referenced
this pull request
Jan 15, 2025
…y default This goes against our rule that we shouldn't add config knob that changes the command behavior, but I don't have any other idea to work around the problem. Apparently, there are two parties, one who always wants to push new bookmarks, and the other who mildly prefers to push&track new bookmarks explicitly. Perhaps, for the former, creation of bookmarks means that the target branches are marked to be pushed. The added flag is a simple boolean. "non-tracking-only" behavior #5173 could be implemented, but I don't want to complicate things. It's a failed attempt to address the issue without introducing config knob. Closes #5094 Closes #5173
Contributor
Author
|
Superseded by f9906dc |
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
3 participants
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.
#5094
Checklist
If applicable:
CHANGELOG.md