From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 10 Mar 2018 17:52:27 +0000 (+0100)
Subject: release: disable git’s rename protection (prevented merging)
X-Git-Tag: 4.16~138^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8513107f099ba4950bedfc72f4131177bc8bb2cd;p=i3%2Fi3

release: disable git’s rename protection (prevented merging)
---

diff --git a/release.sh b/release.sh
index cfb4beae..fb017bb1 100755
--- a/release.sh
+++ b/release.sh
@@ -85,12 +85,12 @@ if [ "${RELEASE_BRANCH}" = "master" ]; then
 	git checkout master
 	git merge --no-ff release-${RELEASE_VERSION} -m "Merge branch 'release-${RELEASE_VERSION}'"
 	git checkout next
-	git merge --no-ff -X ours master -m "Merge branch 'master' into next"
+	git merge --no-ff -s recursive -X ours -X no-renames master -m "Merge branch 'master' into next"
 else
 	git checkout next
 	git merge --no-ff release-${RELEASE_VERSION} -m "Merge branch 'release-${RELEASE_VERSION}'"
 	git checkout master
-	git merge --no-ff -X theirs next -m "Merge branch 'next' into master"
+	git merge --no-ff -s recursive -X theirs -X no-renames next -m "Merge branch 'next' into master"
 fi
 
 git remote remove origin