[arch-commits] Commit in lib32-systemd/trunk (PKGBUILD)

[Christian Hesse]

    Date: Wednesday, June 13, 2018 @ 11:04:23
  Author: eworm
Revision: 342890

do not checkout but fast-forward merge

Modified:
  lib32-systemd/trunk/PKGBUILD

----------+
 PKGBUILD |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-13 10:11:02 UTC (rev 342889)
+++ PKGBUILD	2018-06-13 11:04:23 UTC (rev 342890)
@@ -23,7 +23,7 @@
 options=('strip')
 validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <lennart at poettering.net>
               '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
-source=(# fragment is latest tag for source verification, final checkout in prepare()
+source=(# fragment is latest tag for source verification, final merge in prepare()
         "git+https://github.com/systemd/systemd-stable#tag=v${pkgver%.*}?signed"
         "git+https://github.com/systemd/systemd#tag=v${pkgver%.*}?signed")
 sha512sums=('SKIP'
@@ -40,8 +40,9 @@
 
   # add upstream repository for cherry-picking
   git remote add -f upstream ../systemd
-  # # checkout the latest stable commit
-  git checkout "$_commit"
+  # merge the latest stable commit (fast-foward only to make sure
+  # the verified tag is in)
+  git merge --ff-only "${_commit}"
 
   local c
   for c in "${_backports[@]}"; do