Skip to content

Commit

Permalink
Fix multi-branch import with --silent.
Browse files Browse the repository at this point in the history
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
  • Loading branch information
Simon Hausmann committed May 23, 2007
1 parent ad192f2 commit b3fd1b2
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions contrib/fast-import/git-p4
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit b3fd1b2

Please sign in to comment.