From cee509e609aa7fd924467cf8f8aa955d7d34608d Mon Sep 17 00:00:00 2001
From: stubbfelnewpc <stubbfelnewpc@stubbe.rocks>
Date: Thu, 21 Feb 2019 23:44:39 +0100
Subject: [PATCH] fix build checkout (remove unident reset)

---
 git-build.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/git-build.sh b/git-build.sh
index 9aa59dc..24bb70e 100755
--- a/git-build.sh
+++ b/git-build.sh
@@ -5,14 +5,18 @@ if [ "$COMMAND" == "init" ]; then
     exit
 fi
 
-ORIGIN_BRANCH_NAME=$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!'| sed 's!build\/!!')
+CURRENT_BRANCH_NAME=$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!')
 BUILD_COMMIT_MSG=$(git config --default "build from $(date --utc)" --get build.commit.messages)
 BUILD_BRANCH_PREFIX=$(git config --default "build" --get build.branch.prefix)
 BUILD_REMOTE_ENABLE=$(git config --bool --default false --get build.remote.enable)
 BUILD_REMOTE_NAME=$(git config --default "build" --get build.remote.name)
+ORIGIN_BRANCH_NAME=$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!'| sed "s!$BUILD_BRANCH_PREFIX\/!!")
 BUILD_BRANCH_NAME="$BUILD_BRANCH_PREFIX/$ORIGIN_BRANCH_NAME"
 
-git checkout -B $BUILD_BRANCH_NAME
+if [ "$BUILD_BRANCH_NAME" != "$CURRENT_BRANCH_NAME" ]; then
+    git checkout $BUILD_BRANCH_NAME 2>/dev/null || git checkout -b $BUILD_BRANCH_NAME
+fi
+
 git add --all
 git commit -m "$(eval echo $BUILD_COMMIT_MSG)"