From 9d975e9ee4c44782da0815fb161ea8676dbf559c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Nov 2014 18:48:52 -0400 Subject: add --merge --- src/Propellor/Git.hs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/Propellor/Git.hs') diff --git a/src/Propellor/Git.hs b/src/Propellor/Git.hs index ccf97b94..34bc43e2 100644 --- a/src/Propellor/Git.hs +++ b/src/Propellor/Git.hs @@ -10,8 +10,13 @@ getCurrentBranch :: IO String getCurrentBranch = takeWhile (/= '\n') <$> readProcess "git" ["symbolic-ref", "--short", "HEAD"] +getCurrentBranchRef :: IO String +getCurrentBranchRef = takeWhile (/= '\n') + <$> readProcess "git" ["symbolic-ref", "HEAD"] + getCurrentGitSha1 :: String -> IO String -getCurrentGitSha1 branchref = readProcess "git" ["show-ref", "--hash", branchref] +getCurrentGitSha1 branchref = takeWhile (/= '\n') + <$> readProcess "git" ["show-ref", "--hash", branchref] setRepoUrl :: String -> IO () setRepoUrl "" = return () -- cgit v1.2.3