Set the default branch in run, not in the constructor

Signed-off-by: Simon Hausmann <simon@lst.de>

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index b21dee31997e96f1a6f5e141db007fe2f1838ae9..e6a34f4f478db2451de28687a55c9387d16c7c9d 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -379,7 +379,7 @@ class GitSync(Command):
         self.knownBranches = Set()
         self.createdBranches = Set()
         self.committedChanges = Set()
         self.knownBranches = Set()
         self.createdBranches = Set()
         self.committedChanges = Set()

-        self.branch = "p4"
+        self.branch = ""

         self.detectBranches = False
         self.changesFile = ""
 
         self.detectBranches = False
         self.changesFile = ""
 


@@ -706,6 +706,9 @@ class GitSync(Command):
             self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
 
     def run(self, args):
             self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
 
     def run(self, args):

+        if len(self.branch) == 0:
+            self.branch = "p4"
+

         self.branch = "refs/heads/" + self.branch
         self.globalPrefix = self.previousDepotPath = os.popen("git-repo-config --get p4.depotpath").read()
         if len(self.globalPrefix) != 0:
         self.branch = "refs/heads/" + self.branch
         self.globalPrefix = self.previousDepotPath = os.popen("git-repo-config --get p4.depotpath").read()
         if len(self.globalPrefix) != 0: