Re: [PATCH] git-p4.py: Don't try to rebase on submit from bare repository

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 19, 2016, 17:21 UTC
Message-ID: <xmqqy4agd3b1.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CAE5ih78G1JczQvUEwzz3TmVPZuKUJVcxwZAsDdNzUbqAyHcqqA@mail.gmail.com>

Luke Diamand <luke@diamand.org> writes:

Show 10 quoted lines

> On 17 February 2016 at 22:46, Amadeusz Żołnowski <aidecoe@aidecoe.name> wrote:
>> git-p4 can be successfully used from bare repository (which acts as a
>> bridge between Perforce repository and pure Git repositories). On submit
>> git-p4 performs unconditional rebase. Do rebase only on non-bare
>> repositories.
>
> This looks obviously sensible and good to me, ack.
>
> Thanks!
> Luke

Luke, thanks for a prompt feedback.

Amadeusz, can you sign off your patch (cf. Documentation/SubmittingPatches)?

Show 30 quoted lines

>
>
>
>> ---
>>  git-p4.py | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/git-p4.py b/git-p4.py
>> index c33dece..e00cd02 100755
>> --- a/git-p4.py
>> +++ b/git-p4.py
>> @@ -2059,8 +2059,9 @@ class P4Submit(Command, P4UserMap):
>>                  sync.branch = self.branch
>>              sync.run([])
>>
>> -            rebase = P4Rebase()
>> -            rebase.rebase()
>> +            if not gitConfigBool("core.bare"):
>> +                rebase = P4Rebase()
>> +                rebase.rebase()
>>
>>          else:
>>              if len(applied) == 0:
>> --
>> 2.7.0
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe git" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html