From a204fc448b72a553e99a9d567d488188acc32df7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Nov 2014 18:50:39 -0400 Subject: [PATCH 1/7] propellor spin From ac1272d9d3754fc22d009c1005489b19c59506c2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Nov 2014 18:50:39 -0400 Subject: [PATCH 2/7] propellor spin From 8f47489b867a8c74f54eed492db67083481a34e6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Nov 2014 18:50:39 -0400 Subject: [PATCH 3/7] propellor spin From 131d3b807828829bed838e9f980d594748c26f8a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Nov 2014 18:50:40 -0400 Subject: [PATCH 4/7] propellor spin From 02cd86c2f1477694eae2019176fa803bab034288 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Nov 2014 18:50:40 -0400 Subject: [PATCH 5/7] propellor spin From a38668016a1b048b596482fda4edde99e03a4600 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Nov 2014 18:50:40 -0400 Subject: [PATCH 6/7] propellor spin From 3ef6e352c36df4bc265f08da9e29001ee43af29b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Nov 2014 18:51:07 -0400 Subject: [PATCH 7/7] 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(-) diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs index 9e8e145..13678f5 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]