Re: [PATCH] git-p4.py: Make submit working on bare repository

From: Luke Diamand <luke@diamand.org>
Date: Feb 29, 2016, 15:29 UTC
Message-ID: <CAE5ih7-q_PwF-T6nsu=FyyN9wO6o0Jcfkg=gKy5mhOXRGFZ+VA@mail.gmail.com>
In-Reply-To: <87si0cpnpn.fsf@freja.aidecoe.name>

On 28 February 2016 at 20:46, Amadeusz Żołnowski <aidecoe@aidecoe.name> wrote:

Show 6 quoted lines

>
> True. For now I have these cases covered by wrapper scripts. The minimum
> I need from git-p4 is just not to fail on git submit from bare
> repository which is covered by patch I have submitted. If I get my
> solution enough testing, I'd think of transforming it into patch for
> git-p4.py as well.

Could you change the patch to add a command-line option to suppress the rebase? I think this would be a bit more obvious: instead of having some special magical behaviour kick-in on a bare repo, git-p4 just does what it's told on the command-line.

It means that if we find another situation where we don't want to rebase, we don't have an ever-growing list of special-case circumstances, which could become hard to make sense of in future. Instead, the user (who hopefully knows better) just tells git-p4 what to do.

Thanks! Luke