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

From: Amadeusz Żołnowski <aidecoe@aidecoe.name>
Date: Feb 19, 2016, 18:27 UTC
Message-ID: <1455906431-32140-1-git-send-email-aidecoe@aidecoe.name>
In-Reply-To: <xmqqy4agd3b1.fsf@gitster.mtv.corp.google.com>

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.

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