Re: [PATCHv1 2/3] git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelved
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 12, 2018, 13:45 UTC
- Message-ID
- <xmqq7einb7ob.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <20181012052833.6945-3-luke@diamand.org>
Luke Diamand <luke@diamand.org> writes:
Show 5 quoted lines
> The branch detection code looks for branches under refs/remotes/p4/... > and can end up getting confused if there are unshelved changes in > there as well. This happens in the function p4BranchesInGit(). > > Instead, put the unshelved changes into refs/remotes/p4-unshelved/<N>.
I am not a p4 user (and not a git-p4 user), so it is a bit hard for me to assess if this is a backward incompatibile change and if so how serious potential breakage to existing users would be.
Show 10 quoted lines
> > -If the target branch in refs/remotes/p4/unshelved already exists, the old one will > +If the target branch in refs/remotes/p4-unshelved already exists, the old one will > be renamed. > > ---- > $ git p4 sync > $ git p4 unshelve 12345 > -$ git show refs/remotes/p4/unshelved/12345 > +$ git show p4/unshelved/12345
Isn't this "p4-unshelved/12345" now?