From 3ef6e352c36df4bc265f08da9e29001ee43af29b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Nov 2014 18:51:07 -0400 Subject: one more merge test --allow-empty added to commit, because the spins could all be empty --- src/Propellor/Spin.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor/Spin.hs') 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] -- cgit v1.2.3