From dff0b878c1283f6420209cbcf3919314c12fd880 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sun, 28 Jan 2024 15:49:03 +0000
Subject: [PATCH] fix: commit cherry-picks
---
containers/jug/dev.Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 0d5c50d85..f8ad344dd 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -45,8 +45,9 @@ if [ -n "${SPACK_CHERRYPICKS}" ] ; then
for hash in ${SPACK_CHERRYPICKS} ; do
if [ -n "${SPACK_CHERRYPICKS_FILES_ARRAY[${hash}]+found}" ] ; then
git -C ${SPACK_ROOT} show ${hash} -- ${SPACK_CHERRYPICKS_FILES_ARRAY[${hash}]//,/ } | patch -p1 -d ${SPACK_ROOT}
+ git -C ${SPACK_ROOT} commit --message "$(git show --no-patch --pretty=format:%s ${hash})"
else
- git -C ${SPACK_ROOT} cherry-pick -n ${hash}
+ git -C ${SPACK_ROOT} cherry-pick ${hash}
fi
done
fi
--
GitLab