diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-13 00:10:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-13 00:10:06 -0800 |
| commit | ae4479d4943a522f3dc3a37dce2b833caa70b9bd (patch) | |
| tree | 1d9e103630c360cac20377706f1715982fee86e6 /contrib | |
| parent | adfe4e1ff2c296184856bf55636be845f96b55e5 (diff) | |
| parent | f0c9fe050474e0f2a947366a82a62efd6afbf2ce (diff) | |
| download | git-ae4479d4943a522f3dc3a37dce2b833caa70b9bd.tar.gz | |
Merge branch 'pw/p4'
* pw/p4:
git-p4: test clone @all
git-p4: fix clone @all regression
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 2df3bb21c4..7cb479c5e1 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -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), |