search

drewdeponte / git-ps-rs

Official git-ps Rust implementation - the future of git-ps
https://git-ps.sh
MIT License
78 stars 8 forks source link

You can add patches to a generated branch as a series #264

Closed drewdeponte closed 10 months ago

drewdeponte commented 10 months ago

This shouldn't be possible as we intend to require a non generated branch name for patch series.

It must have been an edge case that we missed.

Lets say that you previous created a branch for a single patch with gps branch 1.

Then you do a gps branch 1-3. It will bring patches 2 and 3 into the ps/rr/ branch that was created previously for patch 1.

If we require a custom named branch for a patch series. We should reject adding the patches to the branch unless a custom branch name is also provided.

However, if they provide a custom branch name the patch that was originally in its own generated branch name will still exist and be associated to that generated branch as well as the named branch.

drewdeponte commented 10 months ago

I think this is fine. We can't make any safe assumptions about the users intenent in this scenario. Therefore, they will have to clean it up the original branch in this scenario.

drewdeponte commented 10 months ago

Closing this issue as it has been resolved and integrated into mainline.