Qortal/qortal
1
0
Fork 0
mirror of https://github.com/Qortal/qortal.git synced 2025-03-27 07:45:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve tools/build-auto-update.sh when working on detached HEAD

Browse Source
This commit is contained in:
catbref 2020-10-28 09:08:16 +00:00
parent f3b8258067
commit 9c18a33d7f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/build-auto-update.sh
View File

@ -13,7 +13,7 @@ fi
cd ${git_dir} cd ${git_dir}
# Check we are in 'master' branch # Check we are in 'master' branch
branch_name=$( git symbolic-ref -q HEAD ) branch_name=$( git symbolic-ref -q HEAD || echo )
branch_name=${branch_name##refs/heads/} branch_name=${branch_name##refs/heads/}
echo "Current git branch: ${branch_name}" echo "Current git branch: ${branch_name}"
if [ "${branch_name}" != "master" ]; then if [ "${branch_name}" != "master" ]; then
@ -78,5 +78,7 @@ git add ${project}.update
git commit --message "XORed, auto-update JAR based on commit ${short_hash}" git commit --message "XORed, auto-update JAR based on commit ${short_hash}"
git push --set-upstream origin --force-with-lease ${update_branch} git push --set-upstream origin --force-with-lease ${update_branch}
branch_name=${branch_name-master}
echo "Changing back to '${branch_name}' branch" echo "Changing back to '${branch_name}' branch"
git checkout --force ${branch_name} git checkout --force ${branch_name}