diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile index f0c9564a..515727f1 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 -C ${SPACK_ROOT} --no-patch --pretty=format:%s ${hash})" + git -C ${SPACK_ROOT} commit --all --message "$(git -C ${SPACK_ROOT} show --no-patch --pretty=format:%s ${hash})" else git -C ${SPACK_ROOT} cherry-pick ${hash} fi