From: Pete Wyckoff Date: Sat, 19 Feb 2011 13:17:59 GMT Subject: [PATCH v2 6/8] git-p4: better message for "git-p4 sync" when not cloned Message-ID: <1298121481-7005-7-git-send-email-pw@padd.com> In-Reply-To: <1298121481-7005-1-git-send-email-pw@padd.com> A common error is to do "git-p4 sync" in a repository that was not initialized by "git-p4 clone". There will be no p4 refs. The error message in this case is a traceback for an assertion, which is confusing. Change it instead to explain the likely problem. Signed-off-by: Pete Wyckoff Acked-By: Tor Arvid Lund --- contrib/fast-import/git-p4 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 6b847c4..04e6c3d 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -1676,6 +1676,8 @@ class P4Sync(Command): changes.sort() else: + if 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), self.changeRange) -- 1.7.4.1