summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2014-11-23 18:51:07 -0400
committerJoey Hess2014-11-23 18:51:07 -0400
commit3ef6e352c36df4bc265f08da9e29001ee43af29b (patch)
treebead2b355125b522dce9950fc3fa5be20005c026 /src
parent9d975e9ee4c44782da0815fb161ea8676dbf559c (diff)
one more merge test
--allow-empty added to commit, because the spins could all be empty
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]