From: Simon Hausmann <shausman@trolltech.com>
Date: Fri, 23 Mar 2007 08:30:41 +0000 (+0100)
Subject: Use the new incremental import style by default
X-Git-Tag: v1.5.3-rc0~65^2^2~152
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=967f72e21b9f38725d64a7520bca99bbef9e8ab3;p=git.git

Use the new incremental import style by default

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index a8f7cce25..61978c3da 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -751,21 +751,22 @@ class GitSync(Command):
 
         if len(self.branch) == 0:
             self.branch = "p4"
-            if len(args) == 0:
-                if not gitBranchExists(self.branch) and gitBranchExists("origin"):
-                    if not self.silent:
-                        print "Creating %s branch in git repository based on origin" % self.branch
-                    system("git branch %s origin" % self.branch)
-
-                [self.previousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self.branch))
-                if len(self.previousDepotPath) > 0 and len(p4Change) > 0:
-                    p4Change = int(p4Change) + 1
-                    self.globalPrefix = self.previousDepotPath
-                    self.changeRange = "@%s,#head" % p4Change
-                    self.initialParent = self.branch
-                    self.tagLastChange = False
-                    if not self.silent:
-                        print "Performing incremental import into %s git branch" % self.branch
+
+        if len(args) == 0:
+            if not gitBranchExists(self.branch) and gitBranchExists("origin"):
+                if not self.silent:
+                    print "Creating %s branch in git repository based on origin" % self.branch
+                system("git branch %s origin" % self.branch)
+
+            [self.previousDepotPath, p4Change] = extractDepotPathAndChangeFromGitLog(extractLogMessageFromGitCommit(self.branch))
+            if len(self.previousDepotPath) > 0 and len(p4Change) > 0:
+                p4Change = int(p4Change) + 1
+                self.globalPrefix = self.previousDepotPath
+                self.changeRange = "@%s,#head" % p4Change
+                self.initialParent = self.branch
+                self.tagLastChange = False
+                if not self.silent:
+                    print "Performing incremental import into %s git branch" % self.branch
 
         self.branch = "refs/heads/" + self.branch