From 5c261fd69be879f3458128398bb6fbb605fb2e1a Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 6 Dec 2015 16:56:07 -0700 Subject: tweak wrong spin branch error message Signed-off-by: Sean Whitton (cherry picked from commit 9d44dcd39bb88408ed4cfc94a7b4dfa34a1b5591) --- src/Propellor/Spin.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Propellor') 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" -- cgit v1.2.3