cli: push new non-tracking bookmarks by default, rename --allow-new flag #5173
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 |
New non-tracking bookmarks within the default push revsets? no. If you like the current |
|
I'll leave this open for a while because of #5094 (comment). I don't want to introduce breaking change again. |
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. |
…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
…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
|
Superseded by f9906dc |
#5094
Checklist
If applicable:
CHANGELOG.md