Fix multi-branch import with --silent.
authorSimon Hausmann <shausman@rhea.troll.no>
Wed, 23 May 2007 21:53:14 +0000 (23:53 +0200)
committerSimon Hausmann <shausman@rhea.troll.no>
Wed, 23 May 2007 21:53:14 +0000 (23:53 +0200)
git-p4

diff --git a/git-p4 b/git-p4
index b2341b7..d8b7080 100755 (executable)
--- a/git-p4
+++ b/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: