From 8645260d4691b5ceef6efb8417201a78e4b3df9d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 27 Aug 2026 14:58:39 +0200 Subject: [PATCH] Do not open the editor when finishing the release `git flow release finish` opened the editor three times, and the content was never edited: twice for the merge commits, where the message generated by git is always kept, and once for the message of the annotated tag, where a placeholder was typed by hand. The last tags carry the message "tag" for that reason. GIT_MERGE_AUTOEDIT=no keeps the merge messages git already generates, and -m provides the tag message. git flow appends the tag name to that message, so the tag of the next release will read "Release v26.09.0". Co-Authored-By: Claude Opus 5 (1M context) --- tools/release/releaseV2.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/release/releaseV2.sh b/tools/release/releaseV2.sh index 071d416d00..cef4b7e6b0 100755 --- a/tools/release/releaseV2.sh +++ b/tools/release/releaseV2.sh @@ -188,7 +188,10 @@ git commit -a -m "Adding fastlane file for version ${version}" printf "\n================================================================================\n" printf "OK, finishing the release...\n" -git flow release finish "${version}" +# GIT_MERGE_AUTOEDIT avoids opening the editor for the 2 merge commits, whose default message is +# always used, and -m provides the message of the annotated tag. git flow appends the tag name to +# it, so the tag message ends up being "Release v${version}". +GIT_MERGE_AUTOEDIT=no git flow release finish -m "Release" "${version}" printf "\n================================================================================\n" read -r -p "Done, push the branch 'main' and the new tag (yes/no) default to yes? " doPush