every goddamn time

Signed-off-by: fbt <fbt@fleshless.org>

PKGBUILD

@@ -3,8 +3,9 @@
 
 pkgbase=systemd-libs
 pkgname=('systemd-libs-systemd' 'systemd-libs-udev')
-_tag='d066a4f747b225d47c5f5c97a8843d30878995b8' # git rev-parse v${pkgver}
-pkgver=252.1
+_tag='472b4e59c3c095248b316ccceac5565fcaae9d3a' # git rev-parse v${pkgver}
+_tag_name=252.1
+pkgver="${_tag_name/-/}"
 pkgrel=1
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
@@ -18,7 +19,7 @@ options=('strip')
 #validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <lennart@poettering.net>
 #              '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
 source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}"
-        "git+https://github.com/systemd/systemd#tag=v${pkgver%.*}"
+        "git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}"
         '0001-Use-Arch-Linux-device-access-groups.patch')
 
 _backports=(
@@ -44,8 +45,12 @@ prepare() {
 
   local _c
   for _c in "${_backports[@]}"; do
+    if [[ $_c == *..* ]]; then
+      git log --oneline --reverse "${_c}"
+    else
       git log --oneline -1 "${_c}"
-    git cherry-pick -n "${_c}"
+    fi
+    git cherry-pick -n -m1 "${_c}"
   done
   for _c in "${_reverts[@]}"; do
     git log --oneline -1 "${_c}"