Skip to content
Snippets Groups Projects
Commit dfd179b0 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

fix: git -C SPACK_ROOT show and git commit --all

parent 0e79b62a
No related branches found
No related tags found
1 merge request!823chore: pythia8-8.310
This commit is part of merge request !823. Comments created here will be created in the context of that merge request.
...@@ -47,7 +47,7 @@ if [ -n "${SPACK_CHERRYPICKS}" ] ; then ...@@ -47,7 +47,7 @@ if [ -n "${SPACK_CHERRYPICKS}" ] ; then
for hash in ${SPACK_CHERRYPICKS} ; do for hash in ${SPACK_CHERRYPICKS} ; do
if [ -n "${SPACK_CHERRYPICKS_FILES_ARRAY[${hash}]+found}" ] ; then 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} 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 else
git -C ${SPACK_ROOT} cherry-pick ${hash} git -C ${SPACK_ROOT} cherry-pick ${hash}
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment