summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2014-11-24 00:50:48 -0400
committerJoey Hess2014-11-24 00:50:48 -0400
commit9ac4e94625c77f6d799f9fd6f2ba0e6bbb133697 (patch)
treee0e10cfd1f50f7379938ed107d79c87c84f40d7c /src
parentccdbf0026dcfdbc5bd9896c4c0fcc8fccf4bd15a (diff)
oops
Diffstat (limited to 'src')
-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]