Merge #134: sync-upstream: parse merge commits w/ and w/o repo identi…

…fier 9321d42 sync-upstream: parse merge commits w/ and w/o repo identifier (Tim Ruffing) Pull request description: ACKs for top commit: jonasnick: ACK 9321d42 Tree-SHA512: 89347703b56199327813b9ac72d2e4b9620d852fb4059855f87a245f60f72605acf57ba07d073affe7eb0c4e7e97814f410679f4ed1e067939fab50c18a1eeee
BlockstreamResearch · Jul 12, 2021 · 1bb5db3 · 1bb5db3
2 parents f3708a1 + 9321d42
commit 1bb5db3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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%?}