From 4f959335730d37be8d7cd53a2af668d8887e72cc Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 29 Oct 2014 16:52:11 +0000 Subject: Remove workaround for an old version of Git --- morphlib/cachedrepo.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/morphlib/cachedrepo.py b/morphlib/cachedrepo.py index 2fc7cfa5..30e08ad9 100644 --- a/morphlib/cachedrepo.py +++ b/morphlib/cachedrepo.py @@ -297,12 +297,8 @@ class CachedRepo(object): raise CheckoutError(self, ref, target_dir) def _update(self): # pragma: no cover - try: - morphlib.git.gitcmd(self._runcmd, 'remote', 'update', - 'origin', '--prune') - except cliapp.AppException, ae: - morphlib.git.gitcmd(self._runcmd, 'remote', 'prune', 'origin') - morphlib.git.gitcmd(self._runcmd, 'remote', 'update', 'origin') + morphlib.git.gitcmd(self._runcmd, 'remote', 'update', + 'origin', '--prune') def __str__(self): # pragma: no cover return self.url -- cgit v1.2.1