main is the new master branch

gerdreiss · Nov 1, 2020 · 14f68be · 14f68be
1 parent 0df82be
commit 14f68be
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -26,7 +26,3 @@ With `stack exec -- gitallup-exe --help` to see this text:
                             updating, comma separated
     -v,--verbose             Verbose output?
     ~~~~
-
-## Run tests
-
-`stack test`
diff --git a/hie.yaml b/hie.yaml
@@ -0,0 +1,2 @@
+cradle:
+    stack:
diff --git a/src/Git.hs b/src/Git.hs
@@ -11,7 +11,13 @@ where
 
 import qualified Data.ByteString.Lazy          as B
 import qualified Data.ByteString.Lazy.Char8    as C8
-import           RIO
+
+import           RIO                            ( ExitCode
+                                                  ( ExitFailure
+                                                  , ExitSuccess
+                                                  )
+                                                , RIO
+                                                )
 import           RIO.Process                    ( proc
                                                 , readProcess
                                                 )
@@ -42,9 +48,12 @@ gitResetHard branch =
     >>= _processResult
 
 isMasterBranch :: B.ByteString -> Bool
-isMasterBranch s = "* master" `elem` branches
+isMasterBranch s = any (`elem` _masterBranches) branches
   where branches = lines . C8.unpack $ s
 
 _processResult :: ReadProcessResult -> RIO App ()
 _processResult (ExitSuccess     , out, _  ) = logSuc (C8.unpack out)
 _processResult (ExitFailure code, _  , err) = logErr code (C8.unpack err)
+
+_masterBranches :: [String]
+_masterBranches = ["* master", "* main"]