OMS/tiedote.md
3
0
Fork 0
Code Issues 14 Pull Requests Projects Releases Wiki Activity

Poista turha --force gitPull funktiosta

Browse Source 
Valitsin --force vaikuttaa git fetch -komennon toimintaan vain kun
ylikirjoitetaan paikallisia kehityshaaroja, mitä gitPull komento ei tee.
This commit is contained in:
Saku Laesvuori 2025-04-16 14:49:36 +03:00
parent 2d5bec9a2d
commit 33c2269671
Signed by: slaesvuo
GPG Key ID: 257D284A2A1D3A32
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/TiedoteMD/Git.hs
View File

@ -21,7 +21,7 @@ import qualified Data.ByteString.Lazy as B
gitPull :: FilePath -> IO () gitPull :: FilePath -> IO ()
gitPull repo = do gitPull repo = do
(exit, err, _) <- runGitCommand repo "fetch" ["--force"] (exit, err, _) <- runGitCommand repo "fetch" []
unless (exit == ExitSuccess) $ throwIO $ UnknownError $ "git-fetch failed: " <> err unless (exit == ExitSuccess) $ throwIO $ UnknownError $ "git-fetch failed: " <> err
(exit', err', _) <- runGitCommand repo "reset" ["--hard","FETCH_HEAD"] (exit', err', _) <- runGitCommand repo "reset" ["--hard","FETCH_HEAD"]
unless (exit' == ExitSuccess) $ throwIO $ UnknownError $ "git-reset failed: " <> err' unless (exit' == ExitSuccess) $ throwIO $ UnknownError $ "git-reset failed: " <> err'