Fix multi-branch import with --silent.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
Simon Hausmann committed
May 23, 2007 at 23:53 UTC
b3fd1b28083cded86fd141c812cfd6d215ef4d5b
1 file changed
+3
-2
contrib/fast-import/git-p4
+3
-2
@@ -831,8 +831,9 @@ class P4Sync(Command):
831
832
# this needs to be called after the conversion from heads/p4 to remotes/p4/master
833
self.listExistingP4GitBranches()
834
- if len(self.p4BranchesInGit) > 1 and not self.silent:
835
- print "Importing from/into multiple branches"
834
+ if len(self.p4BranchesInGit) > 1:
835
+ if not self.silent:
836
+ print "Importing from/into multiple branches"
837
self.detectBranches = True
838
839
if len(args) == 0: