X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fsetlocalversion;h=82e4993f0a7368797989b2acd169fe203766fb7a;hb=5b0bf5e25efe;hp=f54dac88cfd1d86b2cbcf7e35e8b3880f9fcfce0;hpb=d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66;p=pandora-kernel.git diff --git a/scripts/setlocalversion b/scripts/setlocalversion index f54dac88cfd1..82e4993f0a73 100644 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -11,12 +11,12 @@ cd "${1:-.}" || usage # Check for git and a git repo. if head=`git rev-parse --verify HEAD 2>/dev/null`; then # Do we have an untagged version? - if [ "`git name-rev --tags HEAD`" = "HEAD undefined" ]; then + if git name-rev --tags HEAD | grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then printf '%s%s' -g `echo "$head" | cut -c1-8` fi # Are there uncommitted changes? - if git diff-files | read dummy; then - printf '%s' -git_dirty + if git diff-index HEAD | read dummy; then + printf '%s' -dirty fi fi