summaryrefslogtreecommitdiff
path: root/commit-package
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-12-07 14:12:34 +0100
committerErich Eckner <git@eckner.net>2020-12-07 14:12:34 +0100
commit71870175dfa05766efd5e9e6e0b0a95649e4d9bb (patch)
tree9264f1439cf00f49626819772c0404d9bea8ad8b /commit-package
parent44ee3a3d018cc5402fc40773c672b165355214ab (diff)
downloadarchlinuxewe.git.save-71870175dfa05766efd5e9e6e0b0a95649e4d9bb.tar.xz
commit-package: fix pushing
Diffstat (limited to 'commit-package')
-rwxr-xr-xcommit-package3
1 files changed, 2 insertions, 1 deletions
diff --git a/commit-package b/commit-package
index 70f0229d..65ad5b2d 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}"