search

abhinav / git-spice

Manage stacked Git branches
https://abhinav.github.io/git-spice/
GNU General Public License v3.0
259 stars 18 forks source link

Add stack/branch parking ability #506

Open gr4cza opened 2 hours ago

gr4cza commented 2 hours ago

Most of the time, I have multiple stacks concurrently, and I know that a couple of them will not be merged in the near future.

It would be nice if we could mark those stacks or first branches as parked (I borrowed the term from Git Town), so when we run a restack on the trunk (or repo restack #505), we would skip restacking those.

We should also add a --force flag to force restacking parked stacks or branches.

gr4cza commented 2 hours ago

Hi @abhinav,

I added a couple of enhancement ideas that I would use and would be happy to work on.
I hope that's not a problem!

abhinav commented 2 hours ago

That's a cool idea! Right now I untrack branches that I'm pausing. This feels like a better way to go about it.

It would be pretty straightforward to add a "parked" bit to branch state (or a branch "type" in anticipation of other kinds of branches).

I can imagine variants of this operation for all stack scopes (branch, stack, upstack, and downstack). I think the main question here is the naming and how to initiate the reverse.

# e.g.
gs branch park
gs branch unpark

# or this
gs branch freeze
gs branch thaw

Hi @abhinav,

I added a couple of enhancement ideas that I would use and would be happy to work on. I hope that's not a problem!

Not a problem. The suggestions are very welcome!