# HG changeset patch
# User Jim Meyering <meyering@redhat.com>
# Date 1294051843 -3600
# Node ID bae3b310c9700dfe91ba2000d4319f707f8d0264
# Parent  53c8f6f49c6429e77e33082d75ee26222d286f64
git-version-gen: include command name in one more diagnostic

* build-aux/git-version-gen: When the required .tarball-version file
was missing or unreadable, you might see the diagnostic from "cat",
but no trace of the name of the invoking script.  Now, you still see
the diagnostic from cat, but also get one from "git-version-gen: ".
Inspired by a patch from Bruce Korb.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-01-03  Jim Meyering  <meyering@redhat.com>
 
+	git-version-gen: include command name in one more diagnostic
+	* build-aux/git-version-gen: When the required .tarball-version file
+	was missing or unreadable, you might see the diagnostic from "cat",
+	but no trace of the name of the invoking script.  Now, you still see
+	the diagnostic from cat, but also get one from "git-version-gen: ".
+	Inspired by a patch from Bruce Korb.
+
 	update-copyright: adjust test to match changed code
 	* tests/test-update-copyright.sh: Change test's expected output
 	to match new actual output.
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2010-10-13.20; # UTC
+scriptversion=2011-01-03.10; # UTC
 
 # Copyright (C) 2007-2011 Free Software Foundation, Inc.
 #
@@ -85,14 +85,14 @@
 # then try "git describe", then default.
 if test -f $tarball_version_file
 then
-    v=`cat $tarball_version_file` || exit 1
+    v=`cat $tarball_version_file` || v=
     case $v in
 	*$nl*) v= ;; # reject multi-line output
 	[0-9]*) ;;
 	*) v= ;;
     esac
     test -z "$v" \
-	&& echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2
+	&& echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2
 fi
 
 if test -n "$v"