From accad8e05e7503e456798a35e8bba6f83d8ad8b6 Mon Sep 17 00:00:00 2001 From: Pete Wyckoff Date: Wed, 16 Mar 2011 16:52:46 -0400 Subject: git-p4: fix sync new branch regression e32e00d (git-p4: better message for "git-p4 sync" when not cloned, 2011-02-19) broke another use case, that of using "git-p4 sync" to import a new branch into an existing repository. Refine the fix again, on top of the fix in ac34efc. Reported-by: Michael Horowitz Signed-off-by: Pete Wyckoff Tested-by: Michael Horowitz Signed-off-by: Junio C Hamano --- contrib/fast-import/git-p4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 3c44524cdf..d4ddf8dc58 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -1694,7 +1694,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), -- cgit v1.2.3