aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorjaseg <git@jaseg.de>2020-11-18 13:45:47 +0100
committerjaseg <git@jaseg.de>2020-11-18 13:45:47 +0100
commit68497cc5f1016710cf213de7849e96ae6147d13d (patch)
treef838bbe61b9ad04e56af1987dc671c6aa3921f86 /tools
parent31f91a75a4049d65d0765c1f513eb02c469344b3 (diff)
downloadstm32square-68497cc5f1016710cf213de7849e96ae6147d13d.tar.gz
stm32square-68497cc5f1016710cf213de7849e96ae6147d13d.tar.bz2
stm32square-68497cc5f1016710cf213de7849e96ae6147d13d.zip
do_release.sh: Fix branching logic
Diffstat (limited to 'tools')
-rw-r--r--tools/do_release.sh3
1 files changed, 1 insertions, 2 deletions
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