summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Obermaier2023-08-10 13:55:02 +0200
committerHolger Obermaier2023-08-10 13:55:02 +0200
commit04e3ca5f53f8d911ee1ba2d392bd771d4cf3b9f3 (patch)
tree38ab800ad11a556e99b9214cf116c401a29d37f5
parent1bdc119f8e83c3773d2568126653bbd3c7e76e6d (diff)
downloadaur-04e3ca5f53f8d911ee1ba2d392bd771d4cf3b9f3.tar.gz
Avoid problems with git cherry picking for when no commit email is configured
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8796f779df8f..d93e015f5f6f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = handbrake-llvm-optimized
pkgver = 1.6.1.r50.gb94291a97
- pkgrel = 1
+ pkgrel = 2
url = https://handbrake.fr/
arch = x86_64
license = GPL
diff --git a/PKGBUILD b/PKGBUILD
index 50c24283354c..0a21b5e9438f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ pkgver() {
}
pkgver=1.6.1.r50.gb94291a97
-pkgrel=1
+pkgrel=2
arch=('x86_64')
url="https://handbrake.fr/"
license=('GPL')
@@ -82,9 +82,9 @@ sha256sums=('SKIP')
prepare() {
# contrib: update SVT-AV1 to version 1.5.
- git -C HandBrake/ cherry-pick 968992f
+ git -C HandBrake/ cherry-pick --no-commit 968992f
# contrib: update SVT-AV1 to version 1.6.0.
- git -C HandBrake/ cherry-pick 8c2907e
+ git -C HandBrake/ cherry-pick --no-commit 8c2907e
:
}