Make morph's _clone_to_directory use CachedRepo.checkout

This requires changing CachedRepo.checkout to handle non-sha1 refs,
which resulted in some further changes in tests and their expected
outputs.

Also, a fix to CachedRepo to use the cwd keyword argument instead
of pwd.

1 files changed, 2 insertions, 7 deletions

diff --git a/morphlib/cachedrepo.py b/morphlib/cachedrepo.py
index 0f348196..7d2bae4b 100644
--- a/morphlib/cachedrepo.py
+++ b/morphlib/cachedrepo.py
@@ -149,15 +149,10 @@ class CachedRepo(object):
             raise CheckoutDirectoryExistsError(self, target_dir)
             
         os.mkdir(target_dir)
-
-        try:
-            sha1 = self._rev_list(ref).strip()
-        except morphlib.execute.CommandFailure:
-            raise InvalidReferenceError(self, ref)
         
         try:
             self._copy_repository(self.path, target_dir)
-            self._checkout_ref(sha1, target_dir)
+            self._checkout_ref(ref, target_dir)
         except morphlib.execute.CommandFailure:
             raise CheckoutError(self, ref, target_dir)
 
@@ -189,7 +184,7 @@ class CachedRepo(object):
                       target_dir])
 
     def _checkout_ref(self, ref, target_dir): # pragma: no cover
-        self.ex.runv(['git', 'checkout', ref], pwd=target_dir)
+        self.ex.runv(['git', 'checkout', ref], cwd=target_dir)
 
     def _update(self): # pragma: no cover
         self.ex.runv(['git', 'remote', 'update', 'origin'])