konsens: handle >2 commits

2018-09-08 21:26:03 +02:00 · 2018-09-08 21:26:03 +02:00 · 136d7c2f41
parent 8639e4008a
commit 136d7c2f41
1 changed files with 1 additions and 1 deletions
--- 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";