From: Simon Hausmann <shausman@trolltech.com>
Date: Wed, 23 May 2007 21:53:14 +0000 (+0200)
Subject: Fix multi-branch import with --silent.
X-Git-Tag: v1.5.3-rc0~65^2^2~64
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b3fd1b28083cded86fd141c812cfd6d215ef4d5b;p=git.git

Fix multi-branch import with --silent.

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

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index b2341b7ec..d8b7080b4 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -831,8 +831,9 @@ class P4Sync(Command):
 
         # this needs to be called after the conversion from heads/p4 to remotes/p4/master
         self.listExistingP4GitBranches()
-        if len(self.p4BranchesInGit) > 1 and not self.silent:
-            print "Importing from/into multiple branches"
+        if len(self.p4BranchesInGit) > 1:
+            if not self.silent:
+	        print "Importing from/into multiple branches"
             self.detectBranches = True
 
         if len(args) == 0: