From e4cefab98b6cc7f4ab58ce71d3cf1713f10db4be Mon Sep 17 00:00:00 2001 From: Tom Knot Date: Mon, 21 May 2018 19:02:18 +0200 Subject: [PATCH] Updated versioning hooks --- .copy_over_.git/hooks/post-checkout | 2 +- .copy_over_.git/hooks/pre-checkout | 0 .copy_over_.git/hooks/pre-commit | 2 +- .copy_over_.git/hooks/pre-merge | 2 +- version.txt | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 .copy_over_.git/hooks/pre-checkout diff --git a/.copy_over_.git/hooks/post-checkout b/.copy_over_.git/hooks/post-checkout index 8811989..b698e8e 100644 --- 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 index e69de29..0000000 diff --git a/.copy_over_.git/hooks/pre-commit b/.copy_over_.git/hooks/pre-commit index 298995f..7170dd4 100644 --- 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 298995f..7170dd4 100644 --- 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 4573589..b2328ce 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -neuron-kernel Branch:[master] Release: PrecedingRevision:33(0bace6a) +Repository:neuron-kernel ActiveBranch:[master] PrecedingRevision:34(6ef8ca8) -- 2.34.1