git-version-gen: Avoid further processing when tarball-version is present
authorRoss Burton <ross@burtonini.com>
Tue, 20 Oct 2015 14:55:23 +0000 (16:55 +0200)
committerDavid Henningsson <david.henningsson@canonical.com>
Tue, 20 Oct 2015 14:55:23 +0000 (16:55 +0200)
In case a tarball-version file is present, use that and quit.

Otherwise git will continue looking for directories, potentially
finding .git directories which are dirty and mark the version as such.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=90936
git-version-gen

index 7546884..079b93e 100755 (executable)
@@ -84,7 +84,10 @@ then
     v=`cat $tarball_version_file` || exit 1
     case $v in
        *$nl*) v= ;; # reject multi-line output
-       [0-9]*) ;;
+       [0-9]*)
+               echo "$v" | tr -d '\012'
+               exit 0
+               ;;
        *) v= ;;
     esac
     test -z "$v" \