diff options
| author | Pete Wyckoff <pw@padd.com> | 2011-02-19 13:17:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-21 17:57:29 (GMT) |
| commit | e32e00dc88948a730b8b1f3b8129f30c313713e7 (patch) | |
| tree | 626932bcb288c5fc305fef5226251867e00dbf41 /contrib/fast-import | |
| parent | d88e707f17ddcf3f789ec7fb1eb33121cecdcd67 (diff) | |
| download | git-e32e00dc88948a730b8b1f3b8129f30c313713e7.zip git-e32e00dc88948a730b8b1f3b8129f30c313713e7.tar.gz git-e32e00dc88948a730b8b1f3b8129f30c313713e7.tar.bz2 | |
git-p4: better message for "git-p4 sync" when not cloned
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 <pw@padd.com>
Acked-By: Tor Arvid Lund <torarvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/fast-import')
| -rwxr-xr-x | 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) |