summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorJoe Groocock2020-03-31 14:41:27 +0100
committerJoe Groocock2020-03-31 15:02:37 +0100
commit3751baab722a77fe84a1e2650714efe3c965f7bb (patch)
tree4ca64a020b325838ec8eead123424b96342a10f2 /PKGBUILD
parent3a75cecae2f8552053171a75f6b854c307d7ddba (diff)
downloadaur-3751baab722a77fe84a1e2650714efe3c965f7bb.tar.gz
Fetch and rebase upstream without local remote
Should fix the following problem: ==> Starting prepare()... fatal: remote yshui already exists.
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD7
1 files changed, 3 insertions, 4 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 1e8e0570d389..b77e56e4a532 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=picom-tryone-git
_gitname=compton
-pkgver=1350_Next.69.gfc864c0_2020.03.29
+pkgver=1361_0.1_beta2.1012.gc67d7d7_2020.03.31
pkgrel=1
pkgdesc="tryone144's picom fork with dual_kawase blur, an X compositor (fork of compton)"
arch=(i686 x86_64)
@@ -39,9 +39,8 @@ prepare() {
export GIT_CONFIG_NOSYSTEM=1
git config --local user.name makepkg
git config --local user.email picom@makepkg.aur
- git remote add yshui https://github.com/yshui/picom.git
- git fetch yshui
- git rebase yshui/next
+ git fetch https://github.com/yshui/picom.git next
+ git rebase FETCH_HEAD
}
build() {