From 71870175dfa05766efd5e9e6e0b0a95649e4d9bb Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 7 Dec 2020 14:12:34 +0100
Subject: commit-package: fix pushing

---
 commit-package | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'commit-package')

diff --git a/commit-package b/commit-package
index 70f0229d1..65ad5b2d8 100755
--- a/commit-package
+++ b/commit-package
@@ -45,6 +45,7 @@ if [ -d '.git' ] || [ -f '.git' ]; then
     exit 1
   fi
   git checkout archlinuxewe
+  git pull ecknernet --ff-only
   makepkg --printsrcinfo > .SRCINFO
   git commit 'PKGBUILD' '.SRCINFO' -m "${commit_message:-rebuild}"
   git checkout master
@@ -78,7 +79,7 @@ if [ -d '.git' ] || [ -f '.git' ]; then
   git push aur
   git checkout archlinuxewe
   git rebase master
-  git push ecknernet
+  git push ecknernet --force
   cd ..
   if [ -n "${commit_message}" ]; then
     git commit "${paket}" -m "${commit_message}"
-- 
cgit v1.2.3-70-g09d2