summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorSean Whitton2015-12-06 16:56:07 -0700
committerJoey Hess2015-12-08 11:58:56 -0400
commit5c261fd69be879f3458128398bb6fbb605fb2e1a (patch)
tree3ee41efd9f9b5f7333c35282fb02147063fff1d6 /src/Propellor
parent6bacac7f38f60945527f148644d3f9eba70b4bf5 (diff)
tweak wrong spin branch error message
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> (cherry picked from commit 9d44dcd39bb88408ed4cfc94a7b4dfa34a1b5591)
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Spin.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs
index f01975c9..bda146cc 100644
--- a/src/Propellor/Spin.hs
+++ b/src/Propellor/Spin.hs
@@ -38,9 +38,9 @@ commitSpin = do
Nothing -> return () -- just a noop
Just b -> do
currentBranch <- getCurrentBranch
- when (b /= currentBranch) $ error
- ("spin aborted: check out branch "
- ++ b ++ " first")
+ when (b /= currentBranch) $
+ error ("spin aborted: check out "
+ ++ b ++ " branch first")
-- safety check #2: check we can commit with a dirty tree
noDirtySpin <- getGitConfigBool "propellor.forbid-dirty-spin"