summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authorlassulus <lass@blue.r>2018-09-08 21:26:03 +0200
committerlassulus <lass@blue.r>2018-09-08 21:26:03 +0200
commit136d7c2f41815eaa51221bfd13c7ff514a39ed73 (patch)
treecae82a929999a4b09269d239fe9d0a8f6f3e86d1 /krebs
parent8639e4008a34e5e7d68202a621ef8c95fe3087f4 (diff)
konsens: handle >2 commits
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/konsens.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/krebs/3modules/konsens.nix b/krebs/3modules/konsens.nix
index 47316d5d6..74895a971 100644
--- a/krebs/3modules/konsens.nix
+++ b/krebs/3modules/konsens.nix
@@ -68,7 +68,7 @@ let
fi
cd ${name}
git fetch origin
- git push origin $(git merge-base ${concatMapStringsSep " " (branch: "origin/${branch}") repo.branchesToCheck}):refs/heads/master
+ git push origin $(git merge-base --octopus ${concatMapStringsSep " " (branch: "origin/${branch}") repo.branchesToCheck}):refs/heads/master
'';
WorkingDirectory = /var/lib/konsens;
User = "konsens";