From 9321d42f7510e08e0e9f3c0a19fd55cfb7d07775 Mon Sep 17 00:00:00 2001 From: Tim Ruffing Date: Mon, 12 Jul 2021 15:12:50 +0200 Subject: [PATCH] sync-upstream: parse merge commits w/ and w/o repo identifier --- contrib/sync-upstream.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/sync-upstream.sh b/contrib/sync-upstream.sh index c9f47d2e7..9192f013e 100755 --- a/contrib/sync-upstream.sh +++ b/contrib/sync-upstream.sh @@ -81,9 +81,9 @@ TITLE="Upstream PRs" BODY="" for COMMIT in $COMMITS do - PRNUM=$(git log -1 "$COMMIT" --pretty=format:%s | sed s/'Merge #\([0-9]*\).*'/'\1'/) + PRNUM=$(git log -1 "$COMMIT" --pretty=format:%s | sed s/'Merge \(bitcoin-core\/secp256k1\)\?#\([0-9]*\).*'/'\2'/) TITLE="$TITLE $PRNUM," - BODY=$(printf "%s\n%s" "$BODY" "$(git log -1 "$COMMIT" --pretty=format:%s | sed s/'Merge #\([0-9]*\)'/'[bitcoin-core\/secp256k1#\1]'/)") + BODY=$(printf "%s\n%s" "$BODY" "$(git log -1 "$COMMIT" --pretty=format:%s | sed s/'Merge \(bitcoin-core\/secp256k1\)\?#\([0-9]*\)'/'[bitcoin-core\/secp256k1#\2]'/)") done # Remove trailing "," TITLE=${TITLE%?}