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

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Feb 19, 2016, 18:40 UTC
Message-ID: <CAPig+cQA4sJ2RneG8zRsUx+bDPAMYVtmhFjZx5SOGDqnsKNUaQ@mail.gmail.com>
In-Reply-To: <1455906431-32140-1-git-send-email-aidecoe@aidecoe.name>

On Fri, Feb 19, 2016 at 1:27 PM, 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.

As a person who does not use Perforce, it is not obvious to me from the commit message why this change is beneficial or even what the consequences are. Will Perforce users understand this change given only the explanation above? If not, perhaps it would be helpful to expand the commit message to explain more thoroughly the impact of this change and why it is a good idea.

Thanks.

Show 23 quoted lines

> Signed-off-by: Amadeusz Żołnowski <aidecoe@aidecoe.name>
> ---
>  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