Make scripts in package.json a little more readable

Author: pysysops

.gitignore

@@ -13,6 +13,8 @@
 
 .DS_Store
 
+*.log
+
 # Terrafile output
 vendor/modules
 xterrafile

package.json

@@ -6,10 +6,15 @@
   "private": true,
   "scripts": {
     "test": "go build -v ; go test -v ./...",
-    "gitbranch": "BRANCH=$(git symbolic-ref HEAD 2>/dev/null | cut -d\"/\" -f 3); if [[ \"$BRANCH\" != \"master\" ]]; then echo \"you must be on master branch to release\"; exit 1 ; fi",
+    "gitbranch": "BRANCH=$(git rev-parse --abbrev-ref HEAD); if [[ \"$BRANCH\" != \"master\" ]]; then echo \"you must be on master branch to release\"; exit 1 ; fi",
     "gitstatus": "STATUS=$(git status --porcelain 2>&1); echo $STATUS; if [[ ! -z \"$STATUS\" ]]; then exit 1; fi;",
+<<<<<<< Updated upstream
     "gittest": "yarn gitbranch; yarn gitstatus",
     "preversion": "yarn gittest; yarn test",
+=======
+    "gittest": "yarn gitbranch && yarn gitstatus",
+    "preversion": "yarn gittest && yarn test",
+>>>>>>> Stashed changes
     "postversion": "git push --follow-tags"
   }
 }