summaryrefslogtreecommitdiff
path: root/src/Propellor/Spin.hs
diff options
context:
space:
mode:
authorJoey Hess2014-11-24 00:52:46 -0400
committerJoey Hess2014-11-24 00:52:46 -0400
commit24bce962101d28e57a3240344ae63207b30248dd (patch)
tree17623353c419978c830779048cb0b691132fd4ca /src/Propellor/Spin.hs
parentbfc24ce1d7c7007e604dff47d6e8bc560087bb48 (diff)
parent934171e2ea774da4999b14a71b23dab639ff5f41 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Spin.hs')
-rw-r--r--src/Propellor/Spin.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs
index 13678f53..3bafd165 100644
--- a/src/Propellor/Spin.hs
+++ b/src/Propellor/Spin.hs
@@ -278,7 +278,7 @@ mergeSpin = do
old_head <- getCurrentGitSha1 branch
old_commit <- findLastNonSpinCommit
rungit "reset" [Param old_commit]
- rungit "commit" [Param "-a", "--allow-empty"]
+ rungit "commit" [Param "-a", Param "--allow-empty"]
rungit "merge" =<< gpgSignParams [Param "-s", Param "ours", Param old_head]
current_commit <- getCurrentGitSha1 branch
rungit "update-ref" [Param branchref, Param current_commit]