summaryrefslogtreecommitdiff
path: root/src/Propellor/DotDir.hs
diff options
context:
space:
mode:
authorJoey Hess2018-02-19 11:55:44 -0400
committerJoey Hess2018-02-19 11:55:44 -0400
commit98dad1f10e92424871f7356469f42481b40256a6 (patch)
tree4ae8ad2a53bb6669438b9b0f766ebe633804c4ab /src/Propellor/DotDir.hs
parentb75b5a4d8cd9afae8eba675b8a025076c2c552d0 (diff)
comment typo
Diffstat (limited to 'src/Propellor/DotDir.hs')
-rw-r--r--src/Propellor/DotDir.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/DotDir.hs b/src/Propellor/DotDir.hs
index f62b38f8..17eb095a 100644
--- a/src/Propellor/DotDir.hs
+++ b/src/Propellor/DotDir.hs
@@ -389,7 +389,7 @@ checkRepoUpToDate = whenM (gitbundleavail <&&> dotpropellorpopulated) $ do
--
-- If there's no upstream/master, the user is not using the distrepo,
-- so do nothing. And, if there's a remote named "upstream", the user
--- must have set that up is not using the distrepo, so do nothing.
+-- must have set that up and is not using the distrepo, so do nothing.
updateUpstreamMaster :: String -> IO ()
updateUpstreamMaster newref = unlessM (hasRemote "upstream") $ do
changeWorkingDirectory =<< dotPropellor