From 68497cc5f1016710cf213de7849e96ae6147d13d Mon Sep 17 00:00:00 2001
From: jaseg <git@jaseg.de>
Date: Wed, 18 Nov 2020 13:45:47 +0100
Subject: do_release.sh: Fix branching logic

---
 tools/do_release.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/do_release.sh b/tools/do_release.sh
index da5f0fe..3bcacb1 100644
--- a/tools/do_release.sh
+++ b/tools/do_release.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 set -e
 
-SOURCE_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 RELEASE_TRIGGER=${RELEASE_TRIGGER:-"Manual command-line makefile invocation"}
 
 set -x GIT_AUTHOR_NAME=${GIT_AUTHOR_NAME:-'STM32Square Auto-Release Script'}
@@ -15,7 +14,7 @@ fi
 TIMESTAMP=${TIMESTAMP:-$(date +%y-%m-%d)}
 
 git checkout release
-git merge -X theirs $SOURCE_BRANCH
+git merge -X theirs --no-commit master
 
 make clean all
 git add svd mx_mcu_db prog_db chip_db
-- 
cgit