From 33c226967193124dfc6a0f7b8d27e0473384d8a9 Mon Sep 17 00:00:00 2001 From: Saku Laesvuori Date: Wed, 16 Apr 2025 14:49:36 +0300 Subject: [PATCH] Poista turha --force gitPull funktiosta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Valitsin --force vaikuttaa git fetch -komennon toimintaan vain kun ylikirjoitetaan paikallisia kehityshaaroja, mitä gitPull komento ei tee. --- src/TiedoteMD/Git.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TiedoteMD/Git.hs b/src/TiedoteMD/Git.hs index a08e9b4..f4231d3 100644 --- a/src/TiedoteMD/Git.hs +++ b/src/TiedoteMD/Git.hs @@ -21,7 +21,7 @@ import qualified Data.ByteString.Lazy as B gitPull :: FilePath -> IO () gitPull repo = do - (exit, err, _) <- runGitCommand repo "fetch" ["--force"] + (exit, err, _) <- runGitCommand repo "fetch" [] unless (exit == ExitSuccess) $ throwIO $ UnknownError $ "git-fetch failed: " <> err (exit', err', _) <- runGitCommand repo "reset" ["--hard","FETCH_HEAD"] unless (exit' == ExitSuccess) $ throwIO $ UnknownError $ "git-reset failed: " <> err'