From d22ea39cde7d377360b6f8c81aa662a80c5c918b Mon Sep 17 00:00:00 2001 From: James Brechtel Date: Wed, 13 May 2026 23:02:04 -0400 Subject: [PATCH] Formats repo --- src/Converge.hs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Converge.hs b/src/Converge.hs index 686ffe4..963a5e3 100644 --- a/src/Converge.hs +++ b/src/Converge.hs @@ -333,13 +333,17 @@ gitCommitAll logger repoPath = do -- | Pull from the configured remote, rebasing onto the tracked upstream branch. gitPull :: Logger -> RepoConfig -> IO (ExitCode, Text, Text) gitPull logger repo = - loggedGit logger (rcPath repo) + loggedGit + logger + (rcPath repo) ["pull", "--rebase", T.unpack (rcRemote repo)] -- | Push to the configured remote and branch. gitPush :: Logger -> RepoConfig -> IO (ExitCode, Text, Text) gitPush logger repo = - loggedGit logger (rcPath repo) + loggedGit + logger + (rcPath repo) ["push", T.unpack (rcRemote repo), T.unpack (rcBranch repo)] -- | Run a git command and log the invocation and exit code. @@ -348,9 +352,10 @@ loggedGit logger repoPath args = do logInfo logger ("RUN: git -C " <> T.pack repoPath <> " " <> T.intercalate " " (map T.pack args)) result@(code, _, err) <- runGitIn repoPath args let msg = "EXIT " <> T.pack (show code) - details = if code /= ExitSuccess && not (T.null err) - then ": " <> T.strip err - else "" + details = + if code /= ExitSuccess && not (T.null err) + then ": " <> T.strip err + else "" logInfo logger (msg <> details) pure result