Re: Subject: [RFC] stash: let the stash stack live in a configurable ref
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- Aug 25, 2026, 14:43 UTC
- Message-ID
- <e3e7d23c-ad66-42de-b959-f9f2fae8d16b@gmail.com>
- In-Reply-To
- <xmqqfr03sgyu.fsf@gitster.g>
On 24/08/2026 15:58, Junio C Hamano wrote:
Show 18 quoted lines
> Phillip Wood <phillip.wood123@gmail.com> writes: > >> On a related note I've been meaning to add an option to specify an >> alternative branch name when creating a stash, so that "git checkout -m" >> and "git rebase --autostash <upstream> <branch>" can record the branch >> that we're switching to, rather than the one that's currently checked >> out when creating stashes. > > Interesting. I think we have seen ideas floated to allow per-branch > and per-worktree stashes in the past. I am not sure how much we > should rely on the stash message, though. The more heavily we rely > on it, the more restricted the end-user messages supplied via the > '-m' option would become. If we were to officially support > per-branch stashes, we may have to adopt a more structured format > (which could be something simple like "at the end of the message > after the last ':' is the name of the branch the stash entry > targets", alongside a tweak to the '-m' option to always append > ': target-branch' after whatever the user gives as the message).
We add the branch name to the beginning of the user-supplied message in create_stash(). If the user supplies the message then we prepend "On $branch: ", if the user does not supply a message we use "WIP on $branch ..." so I think we already have simple structured messages.
Thanks
Phillip