Merge branch 'pw/p4'

* pw/p4:
  git-p4: test clone @all
  git-p4: fix clone @all regression
This commit is contained in:
Junio C Hamano
2011-03-13 00:10:06 -08:00
2 changed files with 17 additions and 1 deletions

View File

@ -1763,7 +1763,7 @@ class P4Sync(Command):
changes.sort()
else:
if not self.p4BranchesInGit:
if not isinstance(self, P4Clone) and not self.p4BranchesInGit:
die("No remote p4 branches. Perhaps you never did \"git p4 clone\" in here.");
if self.verbose:
print "Getting p4 changes for %s...%s" % (', '.join(self.depotPaths),