From a8deb42b4899ce11d1937bda0b59c8b56f230bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Smr=C5=BE?= <roman.smrz@seznam.cz>
Date: Tue, 4 Mar 2025 22:05:34 +0100
Subject: Execute all git commands with proper git-dir

---
 src/Command/Run.hs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'src/Command/Run.hs')

diff --git a/src/Command/Run.hs b/src/Command/Run.hs
index e2e7cc0..b6fd429 100644
--- a/src/Command/Run.hs
+++ b/src/Command/Run.hs
@@ -19,7 +19,6 @@ import System.Exit
 import System.FilePath
 import System.FilePath.Glob
 import System.IO
-import System.Process
 
 import Command
 import Config
@@ -204,12 +203,8 @@ cmdRun (RunCommand RunOptions {..} args) = do
             ( base, tip ) <- case mbBase of
                 Just base -> return ( base, paramTip )
                 Nothing -> liftIO $ do
-                    [ deref ] <- readProcessWithExitCode "git" [ "symbolic-ref", "--quiet", T.unpack paramTip ] "" >>= \case
-                        ( ExitSuccess, out, _ ) -> return $ lines out
-                        ( _, _, _ ) -> return [ T.unpack paramTip ]
-                    [ _, tip ] : _ <- fmap words . lines <$> readProcess "git" [ "show-ref", deref ] ""
-                    [ base ] <- lines <$> readProcess "git" [ "for-each-ref", "--format=%(upstream)", tip ] ""
-                    return ( T.pack base, T.pack tip )
+                    Just base <- findUpstreamRef repo paramTip
+                    return ( base, paramTip )
             rangeSource repo base tip
 
         branches <- mapM (watchBranchSource repo) roNewCommitsOn
-- 
cgit v1.2.3