pub-release: an unfolded merge leaves out what the previous release has

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
tthandClaude Opus 5.5 committed 2026-11-13 19:05:25 +01:00
1 parent d22005a6fd
commit d23fa74642
1 file changed
+2 -1
+2 -1
View File
@@ -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