From c25b06577c2cc251c541732f245117c913206916 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@burtonini.com>
Date: Tue, 20 Oct 2015 16:55:23 +0200
Subject: git-version-gen: Avoid further processing when tarball-version is
 present

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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'git-version-gen')

diff --git a/git-version-gen b/git-version-gen
index 754688441..079b93ec3 100755
--- a/git-version-gen
+++ b/git-version-gen
@@ -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" \
-- 
cgit v1.2.3