git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
	Max Horn <max@quendi.de>, Dusty Phillips <dusty@linux.ca>
Subject: Re: [PATCH v2 13/13] remote-hg: push to the appropriate branch
Date: Fri, 5 Apr 2013 03:16:47 -0600	[thread overview]
Message-ID: <CAMP44s04kWSQOsfE_KWAPdNSR=5oFnTcJDF4TPfRuQ6jPEGOyw@mail.gmail.com> (raw)
In-Reply-To: <7veheqjl4n.fsf@alter.siamese.dyndns.org>

On Thu, Apr 4, 2013 at 10:50 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
>> From: Dusty Phillips <dusty@linux.ca>
>>
>> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
>> ---
>>  contrib/remote-helpers/git-remote-hg | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
>> index 56b3641..d82eb2d 100755
>> --- a/contrib/remote-helpers/git-remote-hg
>> +++ b/contrib/remote-helpers/git-remote-hg
>> @@ -625,6 +625,10 @@ def parse_commit(parser):
>>      if merge_mark:
>>          get_merge_files(repo, p1, p2, files)
>>
>> +    # Check if the ref is supposed to be a named branch
>> +    if ref.startswith('refs/heads/branches/'):
>> +        extra['branch'] = ref.rpartition('/')[2]
>> +
>
> Is this meant to cut everything after "refs/heads/branches/", or cut
> at the last slash?  I know rpartition does the latter, but I was
> wondering if we see "refs/heads/branches/foo/bar" as its input here.

Good catch, it should be the former.

-- 
Felipe Contreras

      reply	other threads:[~2013-04-06 16:44 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-04 15:30 [PATCH v2 00/13] remote-hg: general updates Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 01/13] remote-hg: trivial cleanups Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 02/13] remote-hg: add missing config variable in doc Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 03/13] remote-hg: properly report errors on bookmark pushes Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 04/13] remote-hg: fix for files with spaces Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 05/13] remote-hg: make sure fake bookmarks are updated Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 06/13] remote-hg: trivial test cleanups Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 07/13] remote-hg: redirect buggy mercurial output Felipe Contreras
2013-04-04 16:40   ` Junio C Hamano
2013-04-04 15:30 ` [PATCH v2 08/13] remote-hg: split bookmark handling Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 09/13] remote-hg: refactor export Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 10/13] remote-hg: update remote bookmarks Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 11/13] remote-hg: force remote push Felipe Contreras
2013-04-04 16:44   ` Junio C Hamano
2013-04-04 18:56     ` Felipe Contreras
2013-04-04 19:06       ` Junio C Hamano
2013-04-04 18:17   ` Jed Brown
2013-04-04 19:13     ` Felipe Contreras
2013-04-04 20:14       ` Jed Brown
2013-04-04 20:35         ` Felipe Contreras
2013-04-04 20:48           ` Jed Brown
2013-04-04 21:34             ` Felipe Contreras
2013-04-04 22:27               ` Jed Brown
2013-04-04 23:06                 ` Felipe Contreras
2013-04-05  6:31                 ` Joachim Schmitz
2013-04-05 12:16                   ` Jed Brown
2013-04-04 15:30 ` [PATCH v2 12/13] remote-hg: update tags globally Felipe Contreras
2013-04-04 15:30 ` [PATCH v2 13/13] remote-hg: push to the appropriate branch Felipe Contreras
2013-04-04 16:50   ` Junio C Hamano
2013-04-05  9:16     ` Felipe Contreras [this message]

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='CAMP44s04kWSQOsfE_KWAPdNSR=5oFnTcJDF4TPfRuQ6jPEGOyw@mail.gmail.com' \
    --to=felipe.contreras@gmail.com \
    --cc=dusty@linux.ca \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=max@quendi.de \
    --cc=peff@peff.net \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).