diff options
| author | Joey Hess <joey@kitenet.net> | 2014-11-23 18:48:52 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-23 18:48:52 -0400 |
| commit | 9d975e9ee4c44782da0815fb161ea8676dbf559c (patch) | |
| tree | b74c1037324cdc4308c98e475202649bf91e27df /src/Propellor/Git.hs | |
| parent | baba668033f86b7c91f6b15c58002ea4bdbf3da2 (diff) | |
add --merge
Diffstat (limited to 'src/Propellor/Git.hs')
| -rw-r--r-- | src/Propellor/Git.hs | 7 |
1 files changed, 6 insertions, 1 deletions
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 () |