Skip to content

Commit f7d4ad7

Browse files
committed
tag-build: sign merge commits
1 parent 294e664 commit f7d4ad7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tag-build

+3-3
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ if test $BRANCH != "master" && test $BRANCH != "next"; then
116116
# Common case: Releasing from a branch, e.g. stable-9999, fixes
117117
echo "Merging active branch $BRANCH back into master."
118118
git checkout master
119-
git merge --ff-only $TAG || exit 7
119+
git merge -S --ff-only $TAG || exit 7
120120

121121
# Then offer to delete it.
122122
echo "Delete branch $BRANCH? [y/N]"
@@ -131,12 +131,12 @@ if test $BRANCH != "master" && test $BRANCH != "next"; then
131131

132132
# Merge master into next.
133133
git checkout next
134-
git merge master
134+
git merge -S master
135135
elif test $BRANCH == "next"; then
136136
# Releasing from next.
137137
# Merge next into master.
138138
git checkout master
139-
git merge next
139+
git merge -S next
140140
fi
141141

142142
# Push changes and end on next.

0 commit comments

Comments
 (0)