Skip to content

Clone recursively #1852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgsloan merged 1 commit into from
Feb 29, 2016
Merged

Clone recursively #1852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ Major changes:

Other enhancements:

* `git` packages with submodules are supported by passing the `--recursive`
flag to `git clone`.

Bug fixes:

## 1.0.4
Expand Down
13 changes: 7 additions & 6 deletions src/Stack/Config.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,13 +576,14 @@ resolvePackageLocation menv projRoot (PLRemote url remotePackageType) = do
unless exists $ do
ignoringAbsence (removeDirRecur dirTmp)

let cloneAndExtract commandName resetCommand commit = do
let cloneAndExtract commandName cloneArgs resetCommand commit = do
ensureDir (parent dirTmp)
readInNull (parent dirTmp) commandName menv
[ "clone"
, T.unpack url
("clone" :
cloneArgs ++
[ T.unpack url
, toFilePathNoTrailingSep dirTmp
]
])
Nothing
readInNull dirTmp commandName menv
(resetCommand ++ [T.unpack commit])
Expand Down Expand Up @@ -615,8 +616,8 @@ resolvePackageLocation menv projRoot (PLRemote url remotePackageType) = do

tryTar `catchAllLog` tryZip `catchAllLog` err

RPTGit commit -> cloneAndExtract "git" ["reset", "--hard"] commit
RPTHg commit -> cloneAndExtract "hg" ["update", "-C"] commit
RPTGit commit -> cloneAndExtract "git" ["--recursive"] ["reset", "--hard"] commit
RPTHg commit -> cloneAndExtract "hg" [] ["update", "-C"] commit

renameDir dirTmp dir

Expand Down