From: Felipe Contreras Date: Sat, 25 May 2013 02:24:26 +0000 (-0500) Subject: remote-bzr: add fallback check for a partial clone X-Git-Tag: v1.8.4-rc0~190^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85f931d3d5adf9d628aa3a75cfdd2f8f940f3d56;p=git remote-bzr: add fallback check for a partial clone Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index 3248586b13..3cd65723c3 100755 --- a/contrib/remote-helpers/git-remote-bzr +++ b/contrib/remote-helpers/git-remote-bzr @@ -766,7 +766,10 @@ def do_list(parser): print def clone(path, remote_branch): - bdir = bzrlib.bzrdir.BzrDir.create(path) + try: + bdir = bzrlib.bzrdir.BzrDir.create(path) + except bzrlib.errors.AlreadyControlDirError: + bdir = bzrlib.bzrdir.BzrDir.open(path) repo = bdir.find_repository() repo.fetch(remote_branch.repository) return remote_branch.sprout(bdir, repository=repo)