blob: 97359c11f010fc6a71cee622254f618d902795db (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
#!/bin/sh
set -e
if git branch|grep -q merge; then
git branch -D merge
fi
if ! git remote|grep -q arch; then
echo "Adding 'arch' remote"
git remote add arch git://projects.archlinux.org/svntogit/packages.git
git remote set-branches arch packages/linux
fi
git fetch arch
git checkout -b merge --no-track arch/packages/linux
FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch -f --subdirectory-filter trunk/
grep ^pkgver PKGBUILD
grep ^pkgrel PKGBUILD
git checkout master
echo "Automerging configs"
git checkout merge -- config
echo "All done, you can now do git checkout --patch merge PKGBUILD"
|