cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-11-23 18:51:36 -04:00
parent ad804c2cf5 1ac0c5bb5f
commit bfc24ce1d7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Propellor/Spin.hs
View File

@ -278,7 +278,7 @@ mergeSpin = do
old_head <- getCurrentGitSha1 branch old_head <- getCurrentGitSha1 branch
old_commit <- findLastNonSpinCommit old_commit <- findLastNonSpinCommit
rungit "reset" [Param old_commit] 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] rungit "merge" =<< gpgSignParams [Param "-s", Param "ours", Param old_head]
current_commit <- getCurrentGitSha1 branch current_commit <- getCurrentGitSha1 branch
rungit "update-ref" [Param branchref, Param current_commit] rungit "update-ref" [Param branchref, Param current_commit]