updated git flow hooks

OPSWAT · Sep 25, 2019 · 950ee63 · 950ee63
1 parent 611259a
commit 950ee63
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -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