Merge remote-tracking branch 'zkp/master' into temp-merge-1488

ci/linux-debian.Dockerfile

@@ -66,6 +66,9 @@ RUN \
     wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc && \
     # Add repository for this Debian release
     . /etc/os-release && echo "deb http://apt.llvm.org/${VERSION_CODENAME} llvm-toolchain-${VERSION_CODENAME} main" >> /etc/apt/sources.list && \
+    # Temporarily work around Sequoia PGP policy deadline for legacy repositories.
+    # See https://github.com/llvm/llvm-project/issues/153385.
+    sed -i 's/\(sha1\.second_preimage_resistance =\).*/\1 9999-01-01/' /usr/share/apt/default-sequoia.config && \
     apt-get update && \
     # Determine the version number of the LLVM development branch
     LLVM_VERSION=$(apt-cache search --names-only '^clang-[0-9]+$' | sort -V | tail -1 | cut -f1 -d" " | cut -f2 -d"-" ) && \

contrib/sync-upstream.sh

@@ -116,7 +116,17 @@ do
 done
 # Remove trailing ","
 TITLE=${TITLE%?}
-BODY=$(printf "%s\n\n%s\n%s" "$BODY" "This PR can be recreated with \`$REPRODUCE_COMMAND\`." "Tip: Use \`git show --remerge-diff\` to show the changes manually added to the merge commit.")
+BODY+=$(cat <<EOF
+
+
+This PR can be recreated with \`$REPRODUCE_COMMAND\`.
+
+Tips:
+ * Use \`git show --remerge-diff <pr-branch>\` to show the conflict resolution in the merge commit.
+ * Use \`git read-tree --reset -u <pr-branch>\` to replay these resolutions during the conflict resolution stage when recreating the PR branch locally.
+   Be aware that this may discard your index as well as the uncommitted changes and untracked files in your worktree.
+EOF
+)
 
 echo "-----------------------------------"
 echo "$TITLE"