]> git.proxmox.com Git - debcargo-conf.git/blob - dev/merge-accepted.sh
Merge remote-tracking branch 'origin/pending-async-global-executor'
[debcargo-conf.git] / dev / merge-accepted.sh
1 #!/bin/bash
2 set -e
3
4 packages=( $(dev/list-pending.sh | dev/filter-package-in-debian.sh | grep -v ' 0$' | cut '-d ' -f1) )
5
6 if [ -z "$packages" ]; then exit 0; fi
7 set -x
8
9 git fetch origin --prune
10 git diff --quiet origin/master || \
11 { echo >&2 "Please sync with origin/master before running this."; exit 1; }
12
13 git merge "${packages[@]/#/pending-}"
14 git push origin master
15 if [ "${PENDING_LOCAL}" != 1 ]; then
16 git push origin "${packages[@]/#/:pending-}"
17 fi
18 dev/sync-pending-branches.sh