From 285ca925e5c705b76755568b2962028cc7a869d9 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Fri, 5 Aug 2016 13:25:42 +0000
Subject: make morphcacheserver repocache resolve ref even if they look like a
 sha1

Change-Id: I2d1da2c094a80b14d80e8b461072ec4097f946b9
---
 morphcacheserver/repocache.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/morphcacheserver/repocache.py b/morphcacheserver/repocache.py
index 3a2d3489..1a023c5a 100644
--- a/morphcacheserver/repocache.py
+++ b/morphcacheserver/repocache.py
@@ -60,12 +60,12 @@ class RepoCache(object):
                 raise RepositoryNotFoundError(repo_url)
         try:
             if re.match('^[0-9a-fA-F]{40}$', ref):
-                sha1 = ref
-            else:
-                if (not self.direct_mode and
-                    not ref.startswith('refs/origin/')):
-                    ref = 'refs/origin/' + ref
-                sha1 = self._rev_list_1(repo_dir, ref)
+                pass
+            elif (not self.direct_mode and
+                not ref.startswith('refs/origin/') and
+                not re.match('^[0-9a-fA-F]{40}$', ref)):
+                ref = 'refs/origin/' + ref
+            sha1 = self._rev_list_1(repo_dir, ref)
             return sha1, self._tree_from_commit(repo_dir, sha1)
 
         except cliapp.AppException:
-- 
cgit v1.2.1