voidlizard
/
hbs2
mirror of https://github.com/voidlizard/hbs2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip33

This commit is contained in:
voidlizard 2024-12-07 13:27:41 +03:00
parent 974196ad9e
commit 4724a85a52
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hbs2-git3/app/Main.hs
View File

@ -632,7 +632,8 @@ export mref' r = connectedDo $ flip runContT pure do
d <- findGitDir >>= orThrow (OtherGitError "git dir not set") d <- findGitDir >>= orThrow (OtherGitError "git dir not set")
shallow <- liftIO (readFile (d </> "shallow")) shallow <- liftIO (try @_ @IOException (readFile (d </> "shallow")))
<&> fromRight mempty
<&> mapMaybe (fromStringMay @GitHash) . lines <&> mapMaybe (fromStringMay @GitHash) . lines
<&> HS.fromList <&> HS.fromList
@ -1306,7 +1307,7 @@ theDict = do
let shallowFile = d </> "shallow" let shallowFile = d </> "shallow"
new <- readTVarIO _orphans new <- readTVarIO _orphans
current <- try @_ @IOError (liftIO $ LBS8.readFile shallowFile) current <- try @_ @IOException (liftIO $ LBS8.readFile shallowFile)
<&> fromRight mempty <&> fromRight mempty
<&> mapMaybe (fromStringMay @GitHash . LBS8.unpack) . LBS8.lines <&> mapMaybe (fromStringMay @GitHash . LBS8.unpack) . LBS8.lines
<&> HS.union new . HS.fromList <&> HS.union new . HS.fromList