From d23fa74642bedf5e25e1a028ea828399ab3c5a37 Mon Sep 17 00:00:00 2001 From: TeTeHacko Date: Fri, 13 Nov 2026 19:05:25 +0100 Subject: [PATCH] pub-release: an unfolded merge leaves out what the previous release has Co-Authored-By: Claude Opus 5.5 --- .github/workflows/pub-release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pub-release.yml b/.github/workflows/pub-release.yml index acc6c509..1dee3702 100644 --- a/.github/workflows/pub-release.yml +++ b/.github/workflows/pub-release.yml @@ -330,7 +330,8 @@ jobs: for c in $(git log --first-parent --format=%H "$base..$SHA"); do if git rev-parse -q --verify "$c^2" >/dev/null; then git log -1 --format=%s "$c" | grep -q '^Merge upstream' && continue - ours+=$(git log --no-merges --format="$fmt" "$c^1..$c^2")$'\n' + # ^base: a merge of main into a branch carries what is released already + ours+=$(git log --no-merges --format="$fmt" "$c^1..$c^2" "^$base")$'\n' else ours+=$(git log -1 --format="$fmt" "$c")$'\n' fi