Add "--recursive" to "stack upgrade --git"

commercialhaskell · Jan 3, 2016 · 3068c9b · 3068c9b
1 parent ecb056c
commit 3068c9b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Stack/Upgrade.hs b/src/Stack/Upgrade.hs
@@ -56,7 +56,11 @@ upgrade gitRepo mresolver builtHash =
                 return Nothing
             else do
                 $logInfo "Cloning stack"
-                let args = [ "clone", repo , "stack", "--depth", "1"]
+                -- NOTE: "--recursive" was added after v1.0.0 (and before the
+                -- next release).  This means that we can't use submodules in
+                -- the stack repo until we're comfortable with "stack upgrade
+                -- --git" not working for earlier versions.
+                let args = [ "clone", repo , "stack", "--depth", "1", "--recursive"]
                 runCmd (Cmd (Just tmp) "git" menv args) Nothing
                 return $ Just $ tmp </> $(mkRelDir "stack")
       Nothing -> do