From da4f331b4136a50e41ce3bb639ad48e519611210 Mon Sep 17 00:00:00 2001 From: Matthew Ahrens Date: Mon, 22 Oct 2018 12:23:30 -0700 Subject: [PATCH] Make gitrev more reliable In some build methods, the gitrev is unnecessarily set to "unknown". We can improve this by changing the gitrev to use `git describe --always --long --dirty`. This gets the revision even when no tag matches (--always). It prints the hash even when it exactly matches a tag (--long). And if there are uncommitted changes, it appends "-dirty", rather than failing (--dirty). Reviewed-by: George Melikov Reviewed by: Pavel Zakharov Reviewed-by: Brian Behlendorf Reviewed-by: Matthew Thode Signed-off-by: Matthew Ahrens Closes #8034 --- scripts/make_gitrev.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/make_gitrev.sh b/scripts/make_gitrev.sh index 757f00fbc..bab9be88d 100755 --- a/scripts/make_gitrev.sh +++ b/scripts/make_gitrev.sh @@ -37,7 +37,5 @@ trap cleanup EXIT # Check if git is installed and we are in a git repo. git rev-parse --git-dir > /dev/null 2>&1 -# Check if there are uncommitted changes -git diff-index --quiet HEAD # Get the git current git revision -ZFS_GIT_REV=$(git describe 2>/dev/null) +ZFS_GIT_REV=$(git describe --always --long --dirty 2>/dev/null)