[arch-commits] Commit in systemd/trunk (PKGBUILD)
Christian Hesse
eworm at archlinux.org
Wed Jun 13 11:02:27 UTC 2018
Date: Wednesday, June 13, 2018 @ 11:02:27
Author: eworm
Revision: 326887
do not checkout but fast-forward merge
Modified:
systemd/trunk/PKGBUILD
----------+
PKGBUILD | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-13 09:25:55 UTC (rev 326886)
+++ PKGBUILD 2018-06-13 11:02:27 UTC (rev 326887)
@@ -19,7 +19,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"
'0001-Use-Arch-Linux-device-access-groups.patch'
@@ -88,8 +88,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
More information about the arch-commits
mailing list