From 0e79b62ab0e3668b7b5756f4b716513b94a70d52 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sun, 28 Jan 2024 16:13:11 +0000
Subject: [PATCH] fix: use SPACK_ROOT in git show
---
containers/jug/dev.Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 592868f4d..f0c9564a8 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -47,7 +47,7 @@ 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})"
+ git -C ${SPACK_ROOT} commit --message "$(git show -C ${SPACK_ROOT} --no-patch --pretty=format:%s ${hash})"
else
git -C ${SPACK_ROOT} cherry-pick ${hash}
fi
--
GitLab