From 9ac4e94625c77f6d799f9fd6f2ba0e6bbb133697 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 24 Nov 2014 00:50:48 -0400 Subject: [PATCH] oops --- src/Propellor/Spin.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs index 13678f5..3bafd16 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]