diff --git a/pagure/__init__.py b/pagure/__init__.py index 3bdbd03..af32587 100644 --- a/pagure/__init__.py +++ b/pagure/__init__.py @@ -436,25 +436,7 @@ def get_remote_repo_path(remote_git, branch_from, loop=False): else: repo = pagure.lib.repo.PagureRepo(repopath) try: - repo.pull(branch=branch_from) - except pagure.exceptions.GitConflictsException as err: - # In this case, we drop the repo and re-try - try: - shutil.rmtree(repopath) - except Exception as err: - LOG.debug(err) - LOG.exception(err) - flask.abort(500, err.message) - - if loop: - # Let's be sure we don't run into an infinite loop - LOG.debug(err) - LOG.exception(err) - flask.abort(500, err.message) - else: - return get_remote_repo_path( - remote_git, branch_from, loop=True) - + repo.pull(branch=branch_from, force=True) except pagure.exceptions.PagureException as err: LOG.debug(err) LOG.exception(err)