This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, monarch_lts has been updated via 6dac46d9c8dd8cc1f27638215704effcf6269baf (commit) from 01fc389137187cabd79a9e87319cd6c462cc6015 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 6dac46d9c8dd8cc1f27638215704effcf6269baf Author: Nicolas Morey-Chaisemartin nmorey@kalray.eu Date: Fri Nov 18 11:18:32 2016 +0100
git_hash: handle git worktree
In git worktrees .git is a file and not a directory. This patches replaces [ -d .git ] test by [ -e .git ] so it works in both cases
Signed-off-by: Nicolas Morey-Chaisemartin nmorey@kalray.eu Reviewed-by: Mike Holmes mike.holmes@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/scripts/git_hash.sh b/scripts/git_hash.sh index 336eb01..d0095d5 100755 --- a/scripts/git_hash.sh +++ b/scripts/git_hash.sh @@ -6,7 +6,7 @@ if [ -z ${1} ]; then fi ROOTDIR=${1}
-if [ -d ${ROOTDIR}/.git ]; then +if [ -e ${ROOTDIR}/.git ]; then hash=$(git --git-dir=${ROOTDIR}/.git describe --match 'v[0-9]*.[0-9]*.[0-9]*.[0-9]*'\ | tr -d "\n") if [[ $(git --git-dir=${ROOTDIR}/.git diff --shortstat 2> /dev/null \ @@ -19,7 +19,7 @@ if [ -d ${ROOTDIR}/.git ]; then sed -i "s|-|.git|" ${ROOTDIR}/.scmversion sed -i "s|-|.|g" ${ROOTDIR}/.scmversion sed -i "s|^v||g" ${ROOTDIR}/.scmversion -elif [ ! -d ${ROOTDIR}/.git -a ! -f ${ROOTDIR}/.scmversion ]; then +elif [ ! -e ${ROOTDIR}/.git -a ! -f ${ROOTDIR}/.scmversion ]; then echo -n "File ROOTDIR/.scmversion not found, " echo "and not inside a git repository" echo "Bailing out! Not recoverable!"
-----------------------------------------------------------------------
Summary of changes: scripts/git_hash.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive