From 14f68beedf46c94e28fe9adfedc7c077a8f9912b Mon Sep 17 00:00:00 2001 From: Gerd Reiss Date: Sun, 1 Nov 2020 10:16:59 +0100 Subject: [PATCH] main is the new master branch --- README.md | 4 ---- hie.yaml | 2 ++ src/Git.hs | 13 +++++++++++-- 3 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 hie.yaml diff --git a/README.md b/README.md index fd8e523..8812e2d 100644 --- 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 new file mode 100644 index 0000000..54aa377 --- /dev/null +++ b/hie.yaml @@ -0,0 +1,2 @@ +cradle: + stack: \ No newline at end of file diff --git a/src/Git.hs b/src/Git.hs index cbfb820..739d34e 100644 --- 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"]