From: Simon Hausmann <simon@lst.de>
Date: Fri, 25 May 2007 06:44:41 +0000 (+0200)
Subject: Avoid creating non-p4 branches in remotes/p4 off of remotes/origin
X-Git-Tag: v1.5.3-rc0~65^2^2~57
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=65c5f3e3f2dfb470c16628032235222a492e3239;p=git.git

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 08af23f9f..1cce38a6f 100755
--- 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
+
             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:
-                [originPreviousDepotPath, originP4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(originHead))
                 [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)