From 8f92109520165e3cde5db0f696b5c62abb141c2c Mon Sep 17 00:00:00 2001
From: sowle <crypto.sowle@gmail.com>
Date: Wed, 2 Jun 2021 00:19:06 +0300
Subject: [PATCH] increment build number script fix

---
 utils/increment_build_number.sh | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/utils/increment_build_number.sh b/utils/increment_build_number.sh
index e9f78c08..c309f973 100644
--- a/utils/increment_build_number.sh
+++ b/utils/increment_build_number.sh
@@ -3,12 +3,11 @@ curr_path=${BASH_SOURCE%/*}
 version_file_path=../src/version.h.in
 
 pushd $curr_path
+
+# clear old local changes if any
+git checkout -- src/*
+
 git pull --ff-only
-if [ $? -ne 0 ]; then
-   echo "Failed to pull"
-   popd
-   exit $?
-fi
 
 build_no_before=`cat $version_file_path | grep 'PROJECT_VERSION_BUILD_NO ' | awk {'print $3'}`
 
@@ -19,15 +18,11 @@ build_no_after=`cat $version_file_path | grep 'PROJECT_VERSION_BUILD_NO ' | awk
 echo "$build_no_before -> $build_no_after"
 
 echo $(pwd -P)
+
 git status
 git commit -a -m"=== build number: $build_no_before -> $build_no_after ==="
 
 git push
-if [ $? -ne 0 ]; then
-   echo "Failed to push"
-   popd
-   exit $?
-fi
 
 echo "Build number was succesefully incremented."
 popd