Merge pull request #163 from awvwgk/fetch

Use different strategy to fetch git dependencies

1 files changed, 9 insertions, 5 deletions

diff --git a/bootstrap/src/Fpm.hs b/bootstrap/src/Fpm.hs
index fdd83d9..d9de668 100644
--- a/bootstrap/src/Fpm.hs
+++ b/bootstrap/src/Fpm.hs
@@ -617,19 +617,23 @@ fetchDependency name version = do
         undefined
       GitVersion versionSpec -> do
         system
-          ("git clone " ++ gitVersionSpecUrl versionSpec ++ " " ++ clonePath)
+          ("git init " ++ clonePath)
         case gitVersionSpecRef versionSpec of
-          Just ref -> withCurrentDirectory clonePath $ do
+          Just ref -> do
             system
-              (  "git checkout "
+              ("git -C " ++ clonePath ++ " fetch " ++ gitVersionSpecUrl versionSpec ++ " "
               ++ (case ref of
                    Tag    tag    -> tag
                    Branch branch -> branch
                    Commit commit -> commit
                  )
               )
-            return (name, clonePath)
-          Nothing -> return (name, clonePath)
+          Nothing -> do
+            system
+              ("git -C " ++ clonePath ++ " fetch " ++ gitVersionSpecUrl versionSpec)
+        system
+          ("git -C " ++ clonePath ++ " checkout -qf FETCH_HEAD")
+        return (name, clonePath)
       PathVersion versionSpec -> return (name, pathVersionSpecPath versionSpec)
 
 {-