Re: [PATCH v3 05/10] remote-hg: fix new branch creation

From: Junio C Hamano <gitster@pobox.com>
Date: May 15, 2013, 19:40 UTC
Message-ID: <7v8v3gav6v.fsf@alter.siamese.dyndns.org>
In-Reply-To: <51929c576d949_13a8f89e18183b@nysa.mail>

Felipe Contreras <felipe.contreras@gmail.com> writes:

> Felipe Contreras wrote:
>> When force_push is disabled, we need to turn the argument to True.

With your follow-up clarification, here is what ended up in the log message:

    remote-hg: fix new branch creation

    When a user creates a new branch with git:

      $ git checkout -b branches/devel

    and then pushes this branch

      $ git push origin branches/devel

    which is the way to push new mercurial branches, we do want to
    create a branch, but the command would fail without newbranch=True.

    This only matters when force_push=False, but setting newbranch=True
    unconditionally does not hurt.

The only part that I came up with on my own is "but ... does not hurt" at the end. If that is incorrect, please supply an update.

Thanks.

Show 20 quoted lines

>> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
>> ---
>>  contrib/remote-helpers/git-remote-hg | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
>> index 4a5c72f..3cf9b4c 100755
>> --- a/contrib/remote-helpers/git-remote-hg
>> +++ b/contrib/remote-helpers/git-remote-hg
>> @@ -856,7 +856,7 @@ def do_export(parser):
>>              continue
>>  
>>      if peer:
>> -        parser.repo.push(peer, force=force_push)
>> +        parser.repo.push(peer, force=force_push, newbranch=True)
>>  
>>      # handle bookmarks
>>      for bmark, node in p_bmarks:
>> -- 
>> 1.8.3.rc1.579.g184e698