Fix multi-branch import with --silent.
authorSimon Hausmann <shausman@trolltech.com>
Wed, 23 May 2007 21:53:14 +0000 (23:53 +0200)
committerSimon Hausmann <shausman@trolltech.com>
Wed, 23 May 2007 21:53:14 +0000 (23:53 +0200)
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
contrib/fast-import/git-p4

index b2341b7ec4592f0457adfddc6e4f711191b9e36a..d8b7080b4bdb403ae48489bbaeeb0d3a03abab57 100755 (executable)
@@ -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: