Re: [PATCH 6/8] git-p4: better message for "git-p4 sync" when not cloned

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sat, Feb 5, 2011 at 11:52 PM, Pete Wyckoff <pw@xxxxxxxx> wrote:
> 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@xxxxxxxx>

Acked-By: Tor Arvid Lund <torarvid@xxxxxxxxx>

> ---
> Â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.2.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at Âhttp://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]