Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/trunk' into series/M2
Browse files Browse the repository at this point in the history
  • Loading branch information
hojberg committed Feb 11, 2022
2 parents 877a1e1 + e6122fa commit 0e35a14
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions parser-typechecker/src/Unison/Codebase/Editor/Git.hs
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,7 @@ withRepo repo@(ReadGitRepo {url = uri, ref = mayGitRef}) branchBehavior action =
"--force", -- force updating local refs even if not fast-forward
-- update local refs with the same name they have on the remote.
"--refmap", "*:*",
-- Note: a shallow fetch saves time initially, but prevents
-- 'local' clones from using hard-links, so doing a normal fetch saves the most time
-- in the long run.
-- "--depth", "1",
"--depth", "1",
uri, -- The repo to fetch from
gitRef -- The specific reference to fetch
] ++ gitVerbosity
Expand All @@ -221,10 +218,7 @@ cloneIfMissing repo@(ReadGitRepo {url=uri}) localPath = do
gitGlobal
(["clone"]
++ ["--bare"]
-- Note: a shallow clone saves time on the initial clone, but prevents all future
-- 'local' clones from using hard-links, so doing a full clone saves the most time
-- in the long run.
-- ++ ["--depth", "1"]
++ ["--depth", "1"]
++ [uri, Text.pack localPath]))
`withIOError` (throwError . GitError.CloneException repo . show)
isGitDir <- liftIO $ isGitRepo (Bare localPath)
Expand Down

0 comments on commit 0e35a14

Please sign in to comment.