From: Luke Diamand <luke@diamand.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Git Users" <git@vger.kernel.org>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Chen Bin" <chenbin.sh@gmail.com>,
"Miguel Torroja" <miguel.torroja@gmail.com>,
"George Vanburgh" <gvanburgh@bloomberg.net>,
"Merland Romain" <merlorom@yahoo.fr>,
"Vinicius Kursancew" <viniciusalexandre@gmail.com>,
"Lars Schneider" <larsxschneider@gmail.com>,
"Lex Spoon" <lex@lexspoon.org>
Subject: Re: [PATCHv1 2/3] git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelved
Date: Fri, 12 Oct 2018 19:19:06 +0100 [thread overview]
Message-ID: <CAE5ih7_sT8aP7n6h0moEj=6JjRAGJ+AXUCDkTFoJmnbE_Nh1mA@mail.gmail.com> (raw)
In-Reply-To: <xmqq7einb7ob.fsf@gitster-ct.c.googlers.com>
On Fri, 12 Oct 2018 at 14:45, Junio C Hamano <gitster@pobox.com> wrote:
>
> Luke Diamand <luke@diamand.org> writes:
>
> > 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.
I don't think it's a particularly serious breakage - it reports the
branch it unshelves to, so it should be fairly obvious.
However, maybe it would make sense to pull this into a separate commit
to make it more obvious? I should have thought of that before
submitting.
>
> >
> > -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?
Yes, I think another reason to pull into a separate commit.
Luke
>
next prev parent reply other threads:[~2018-10-12 18:19 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-12 5:28 [PATCHv1 0/3] git-p4: improved unshelving Luke Diamand
2018-10-12 5:28 ` [PATCHv1 1/3] git-p4: do not fail in verbose mode for missing 'fileSize' key Luke Diamand
2018-10-12 5:28 ` [PATCHv1 2/3] git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelved Luke Diamand
2018-10-12 13:45 ` Junio C Hamano
2018-10-12 18:19 ` Luke Diamand [this message]
2018-10-15 11:03 ` Luke Diamand
2018-10-12 5:28 ` [PATCHv1 3/3] git-p4: fully support unshelving changelists Luke Diamand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAE5ih7_sT8aP7n6h0moEj=6JjRAGJ+AXUCDkTFoJmnbE_Nh1mA@mail.gmail.com' \
--to=luke@diamand.org \
--cc=chenbin.sh@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=gvanburgh@bloomberg.net \
--cc=larsxschneider@gmail.com \
--cc=lex@lexspoon.org \
--cc=merlorom@yahoo.fr \
--cc=miguel.torroja@gmail.com \
--cc=szeder.dev@gmail.com \
--cc=viniciusalexandre@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.