Updated versioning hooks

diff --git a/.copy_over_.git/hooks/post-checkout b/.copy_over_.git/hooks/post-checkout
index 8811989902a3e57a7c0be454cc7da58304666eb7..b698e8e4363755a830315a210936715a32bb514d 100644 (file)
--- a/.copy_over_.git/hooks/post-checkout
+++ b/.copy_over_.git/hooks/post-checkout
@@ -9,6 +9,6 @@ SHORTHASH=`git log --pretty=format:'%h' -n 1`
 REVCOUNT=`git log --oneline | wc -l`
 LATESTTAG=`git describe --tags --abbrev=0`
 
-VERSION="$REPONAME Branch:[$BRANCH] Release:$LATESTTAG PrecedingRevision:$REVCOUNT($SHORTHASH)"
+VERSION="Repository:$REPONAME ActiveBranch:[$BRANCH] `if [ -n \"$LATESTTAG\" ]; then echo \"PrecedingRelease:$LATESTTAG\"; fi` PrecedingRevision:$REVCOUNT($SHORTHASH)"
 echo $VERSION > $FILENAME
 git update-index --assume-unchanged $FILENAME
\ No newline at end of file

diff --git a/.copy_over_.git/hooks/pre-checkout b/.copy_over_.git/hooks/pre-checkout
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/.copy_over_.git/hooks/pre-commit b/.copy_over_.git/hooks/pre-commit
index 298995f809d53696e8b53b0877ece3d0004012f5..7170dd4cefb2302ef38fe422a39f9d6001c9f71d 100644 (file)
--- a/.copy_over_.git/hooks/pre-commit
+++ b/.copy_over_.git/hooks/pre-commit
@@ -9,7 +9,7 @@ SHORTHASH=`git log --pretty=format:'%h' -n 1`
 REVCOUNT=`git log --oneline | wc -l`
 LATESTTAG=`git describe --tags --abbrev=0`
 
-VERSION="$REPONAME Branch:[$BRANCH] Release:$LATESTTAG PrecedingRevision:$REVCOUNT($SHORTHASH)"
+VERSION="Repository:$REPONAME ActiveBranch:[$BRANCH] `if [ -n \"$LATESTTAG\" ]; then echo \"PrecedingRelease:$LATESTTAG\"; fi` PrecedingRevision:$REVCOUNT($SHORTHASH)"
 echo $VERSION > $FILENAME
 git update-index --no-assume-unchanged $FILENAME
 git add $FILENAME
\ No newline at end of file

diff --git a/.copy_over_.git/hooks/pre-merge b/.copy_over_.git/hooks/pre-merge
index 298995f809d53696e8b53b0877ece3d0004012f5..7170dd4cefb2302ef38fe422a39f9d6001c9f71d 100644 (file)
--- a/.copy_over_.git/hooks/pre-merge
+++ b/.copy_over_.git/hooks/pre-merge
@@ -9,7 +9,7 @@ SHORTHASH=`git log --pretty=format:'%h' -n 1`
 REVCOUNT=`git log --oneline | wc -l`
 LATESTTAG=`git describe --tags --abbrev=0`
 
-VERSION="$REPONAME Branch:[$BRANCH] Release:$LATESTTAG PrecedingRevision:$REVCOUNT($SHORTHASH)"
+VERSION="Repository:$REPONAME ActiveBranch:[$BRANCH] `if [ -n \"$LATESTTAG\" ]; then echo \"PrecedingRelease:$LATESTTAG\"; fi` PrecedingRevision:$REVCOUNT($SHORTHASH)"
 echo $VERSION > $FILENAME
 git update-index --no-assume-unchanged $FILENAME
 git add $FILENAME
\ No newline at end of file

diff --git a/version.txt b/version.txt
index 4573589a0136cca43b5d22106ea4060224c2906c..b2328cef841a7fd147e537da277a8b586f01debb 100644 (file)
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-neuron-kernel Branch:[master] Release: PrecedingRevision:33(0bace6a)
+Repository:neuron-kernel ActiveBranch:[master] PrecedingRevision:34(6ef8ca8)