diff options
| author | Simon Hausmann <shausman@trolltech.com> | 2007-05-23 21:53:14 (GMT) |
|---|---|---|
| committer | Simon Hausmann <shausman@trolltech.com> | 2007-05-23 21:53:14 (GMT) |
| commit | b3fd1b28083cded86fd141c812cfd6d215ef4d5b (patch) | |
| tree | 673102ba2e4eebcce63fe065801e4ccf2c8ae056 /contrib | |
| parent | ad192f2888816454df14b8a35945fb418bcb9e13 (diff) | |
| download | git-b3fd1b28083cded86fd141c812cfd6d215ef4d5b.zip git-b3fd1b28083cded86fd141c812cfd6d215ef4d5b.tar.gz git-b3fd1b28083cded86fd141c812cfd6d215ef4d5b.tar.bz2 | |
Fix multi-branch import with --silent.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index b2341b7..d8b7080 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: |