From 950ee633e2affc8f921cfbe4fcbbed845c7656ca Mon Sep 17 00:00:00 2001
From: Andrei Domsa <andrei.domsa@opswat.com>
Date: Wed, 25 Sep 2019 17:10:33 +0300
Subject: [PATCH] updated git flow hooks

---
 git_hooks/pre-flow-hotfix-start  | 3 +++
 git_hooks/pre-flow-release-start | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/git_hooks/pre-flow-hotfix-start b/git_hooks/pre-flow-hotfix-start
index 2b7c97d..ac9a520 100755
--- a/git_hooks/pre-flow-hotfix-start
+++ b/git_hooks/pre-flow-hotfix-start
@@ -3,6 +3,9 @@
 VERSION=$1
 echo "Incrementing version to $VERSION"
 
+git checkout customer
+git pull
+
 sed -i "s/\"version\": \".*\"/\"version\": \"${VERSION}\"/g" package.json
 sed -i "s/\"version\": \".*\"/\"version\": \"${VERSION}\"/g" app/manifest.json
 
diff --git a/git_hooks/pre-flow-release-start b/git_hooks/pre-flow-release-start
index 2b7c97d..ddf73b4 100755
--- a/git_hooks/pre-flow-release-start
+++ b/git_hooks/pre-flow-release-start
@@ -3,6 +3,9 @@
 VERSION=$1
 echo "Incrementing version to $VERSION"
 
+git checkout master
+git pull
+
 sed -i "s/\"version\": \".*\"/\"version\": \"${VERSION}\"/g" package.json
 sed -i "s/\"version\": \".*\"/\"version\": \"${VERSION}\"/g" app/manifest.json