diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-02-27 12:09:46 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-02-27 12:09:46 -0400 |
| commit | 3919fa183bce29d4fbdbdcc4bd780e462dd6700f (patch) | |
| tree | 1e549d69ec771d7f5505b94c93c5843bd44850fb /src/Propellor/Git/VerifiedBranch.hs | |
| parent | 3e1d8b6b6cbbb4d9560fb0d2ea1aec22e5f19239 (diff) | |
| parent | 094a6419f7e5ddb0566e10ef4122306187dc00d7 (diff) | |
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Git/VerifiedBranch.hs')
| -rw-r--r-- | src/Propellor/Git/VerifiedBranch.hs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/Propellor/Git/VerifiedBranch.hs b/src/Propellor/Git/VerifiedBranch.hs index 51fcb573..df607bd2 100644 --- a/src/Propellor/Git/VerifiedBranch.hs +++ b/src/Propellor/Git/VerifiedBranch.hs @@ -30,12 +30,17 @@ verifyOriginBranch originbranch = do -- Returns True if HEAD is changed by fetching and merging from origin. fetchOrigin :: IO Bool fetchOrigin = do + fetched <- actionMessage "Pull from central git repository" $ + boolSystem "git" [Param "fetch"] + if fetched + then mergeOrigin + else return False + +mergeOrigin :: IO Bool +mergeOrigin = do branchref <- getCurrentBranch let originbranch = "origin" </> branchref - void $ actionMessage "Pull from central git repository" $ - boolSystem "git" [Param "fetch"] - oldsha <- getCurrentGitSha1 branchref keyring <- privDataKeyring |