Avoid creating non-p4 branches in remotes/p4 off of remotes/origin

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

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 08af23f9fd23e113c13b55ce2cd62803c27b89ae..1cce38a6f7d77cd4dd317c79e474d1e7b0d5de1f 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -802,19 +802,23 @@ class P4Sync(Command):
         for line in mypopen("git rev-parse --symbolic --remotes"):
             if (not line.startswith("origin/")) or line.endswith("HEAD\n"):
                 continue
         for line in mypopen("git rev-parse --symbolic --remotes"):
             if (not line.startswith("origin/")) or line.endswith("HEAD\n"):
                 continue

+

             headName = line[len("origin/"):-1]
             remoteHead = self.refPrefix + headName
             originHead = "origin/" + headName
 
             headName = line[len("origin/"):-1]
             remoteHead = self.refPrefix + headName
             originHead = "origin/" + headName
 

+            [originPreviousDepotPath, originP4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(originHead))
+            if len(originPreviousDepotPath) == 0 or len(originP4Change) == 0:
+                continue
+

             update = False
             if not os.path.exists(gitdir + "/" + remoteHead):
                 if self.verbose:
                     print "creating %s" % remoteHead
                 update = True
             else:
             update = False
             if not os.path.exists(gitdir + "/" + remoteHead):
                 if self.verbose:
                     print "creating %s" % remoteHead
                 update = True
             else:

-                [originPreviousDepotPath, originP4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(originHead))

                 [p4PreviousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(remoteHead))
                 [p4PreviousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(remoteHead))

-                if len(originPreviousDepotPath) > 0 and len(originP4Change) > 0 and len(p4Change) > 0:
+                if len(p4Change) > 0:

                     if originPreviousDepotPath == p4PreviousDepotPath:
                         originP4Change = int(originP4Change)
                         p4Change = int(p4Change)
                     if originPreviousDepotPath == p4PreviousDepotPath:
                         originP4Change = int(originP4Change)
                         p4Change = int(p4Change)