Skip to content

Commit

Permalink
fix: git -C SPACK_ROOT show and git commit --all
Browse files Browse the repository at this point in the history
  • Loading branch information
wdconinc committed Jan 28, 2024
1 parent 0e79b62 commit dfd179b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion containers/jug/dev.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit dfd179b

Please sign in to comment.