summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Groocock2020-04-11 21:16:25 +0100
committerJoe Groocock2020-04-11 21:16:25 +0100
commitd2a602e17d7031a46901fd51dcda79fd44472c4b (patch)
tree4c94a0b099a611d94d8800eca0ce1ac20f57c7d8
parent675182f58716f72502a188afaafb6bc315c51e89 (diff)
downloadaur-d2a602e17d7031a46901fd51dcda79fd44472c4b.tar.gz
Silently abort any previously failed rebase attempts
-rw-r--r--PKGBUILD1
1 files changed, 1 insertions, 0 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 12795abcbc3a..2266d497902b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -38,6 +38,7 @@ prepare() {
export GIT_CONFIG_NOSYSTEM=1
git config --local user.name makepkg
git config --local user.email picom@makepkg.aur
+ git rebase --abort 2>&1 >/dev/null || :
git fetch https://github.com/yshui/picom.git next
git rebase FETCH_HEAD
}