projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable'
[gnulib.git]
/
build-aux
/
git-version-gen
diff --git
a/build-aux/git-version-gen
b/build-aux/git-version-gen
index
7aa0253
..
8317604
100755
(executable)
--- a/
build-aux/git-version-gen
+++ b/
build-aux/git-version-gen
@@
-1,13
+1,13
@@
#!/bin/sh
# Print a version string.
#!/bin/sh
# Print a version string.
-scriptversion=200
8-04-03
.22
+scriptversion=200
9-09-09
.22
-# Copyright (C) 2007-200
8
Free Software Foundation
+# Copyright (C) 2007-200
9
Free Software Foundation
#
#
-# This program is free software
;
you can redistribute it and/or modify
+# This program is free software
:
you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3
, or (at your option)
-# any later version.
+# the Free Software Foundation; either version 3
of the License, or
+#
(at your option)
any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,9
+15,7
@@
scriptversion=2008-04-03.22
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
# It may be run two ways:
# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
# It may be run two ways:
@@
-95,7
+93,8
@@
if test -n "$v"
then
: # use $v
elif test -d .git \
then
: # use $v
elif test -d .git \
- && v=`git describe --abbrev=4 HEAD 2>/dev/null` \
+ && v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
+ || git describe --abbrev=4 HEAD 2>/dev/null` \
&& case $v in
v[0-9]*) ;;
*) (exit 1) ;;
&& case $v in
v[0-9]*) ;;
*) (exit 1) ;;