summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2014-11-23 18:51:36 -0400
committerJoey Hess2014-11-23 18:51:36 -0400
commitbfc24ce1d7c7007e604dff47d6e8bc560087bb48 (patch)
treecccac95f33f7b4adce0c8f65406223d4ffbb07a0 /src
parentad804c2cf55b4b839fa8a62ddac9df058e3733cb (diff)
parent1ac0c5bb5f86008dcd8304df42fcffaff881f727 (diff)
Merge branch 'joeyconfig'
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 9e8e145f..13678f53 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"]
+ rungit "commit" [Param "-a", "--allow-empty"]
rungit "merge" =<< gpgSignParams [Param "-s", Param "ours", Param old_head]
current_commit <- getCurrentGitSha1 branch
rungit "update-ref" [Param branchref, Param current_commit]