diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-23 14:54:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-23 14:54:24 -0700 |
| commit | 98b256bd0857ab2192fdad27c26edbb0df3d96d1 (patch) | |
| tree | ef1b9615f122d88d41a56c2424548dd66ca414e1 /contrib | |
| parent | 5e839c8f6d5edfaf0d2250f3c9628a238e24c6be (diff) | |
| parent | 27c6000b28c89cad7af23df90d52bf33e205f61f (diff) | |
| download | git-98b256bd0857ab2192fdad27c26edbb0df3d96d1.tar.gz | |
Merge branch 'pw/p4'
* pw/p4:
git-p4: test sync new branch
git-p4: fix sync new branch regression
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 47ba7adafb..3881515034 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -1780,7 +1780,9 @@ class P4Sync(Command): changes.sort() else: - if not isinstance(self, P4Clone) and not self.p4BranchesInGit: + # catch "git-p4 sync" with no new branches, in a repo that + # does not have any existing git-p4 branches + if len(args) == 0 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), |