s464900/gonito
1
0
Fork 0
forked from filipg/gonito
Code Issues Pull Requests Projects Releases Wiki Activity

fix update a submission when using git-annex

Browse Source
This commit is contained in:
Filip Graliński 2018-06-06 12:58:50 +02:00
parent 85c9ad6646
commit 92c0927dca
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Handler/Shared.hs
View File

@ -130,15 +130,15 @@ updateRepo repoId chan = do
repo <- runDB $ get404 repoId repo <- runDB $ get404 repoId
repoDir <- getRepoDir repoId repoDir <- getRepoDir repoId
let branch = repoBranch repo let branch = repoBranch repo
(exitCode, _) <- runProgram (Just repoDir) gitPath ["fetch", exitCode <- runWithChannel chan $ do
runProg (Just repoDir) gitPath ["fetch",
"origin", "origin",
T.unpack branch, T.unpack branch,
"--progress"] chan "--progress"]
case exitCode of runProg (Just repoDir) gitPath ["reset",
ExitSuccess -> do
(exitCode, _) <- runProgram (Just repoDir) gitPath ["reset",
"--hard", "--hard",
"FETCH_HEAD"] chan "FETCH_HEAD"]
getStuffUsingGitAnnex repoDir (repoGitAnnexRemote repo)
case exitCode of case exitCode of
ExitSuccess -> do ExitSuccess -> do
maybeHeadCommit <- getHeadCommit repoDir chan maybeHeadCommit <- getHeadCommit repoDir chan
@ -148,7 +148,6 @@ updateRepo repoId chan = do
return True return True
Nothing -> return False Nothing -> return False
_ -> return False _ -> return False
_ -> return False
getHeadCommit :: FilePath -> Channel -> Handler (Maybe SHA1) getHeadCommit :: FilePath -> Channel -> Handler (Maybe SHA1)
getHeadCommit repoDir chan = do getHeadCommit repoDir chan = do