mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

Update git-version-gen.diff for current gnulib

Browse source 
* gnulib-local/build-aux/git-version-gen.diff: Update.
This commit is contained in:
Andy Wingo 2016-07-07 14:02:25 +02:00
parent 85faf8eccb
commit 0d191d1394
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
gnulib-local/build-aux/git-version-gen.diff
View file

@ -2,17 +2,19 @@ This patch is being discussed
at <http://lists.gnu.org/archive/html/bug-gnulib/2012-07/msg00079.html>. at <http://lists.gnu.org/archive/html/bug-gnulib/2012-07/msg00079.html>.
Remove when integrated in Gnulib. Remove when integrated in Gnulib.
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index bd2c4b6..4458d7d 100755
--- a/build-aux/git-version-gen --- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen +++ b/build-aux/git-version-gen
@@ -86,6 +86,7 @@ Print a version string. @@ -86,6 +86,7 @@ Print a version string.
Options: Options:
--prefix prefix of git tags (default 'v') --prefix PREFIX prefix of git tags (default 'v')
+ --match pattern for git tags to match (default: '\$prefix*') + --match pattern for git tags to match (default: '\$prefix*')
--fallback fallback version to use if \"git --version\" fails --fallback VERSION
fallback version to use if \"git --version\" fails
--help display this help and exit @@ -97,11 +98,15 @@ Running without arguments will suffice in most cases."
@@ -96,11 +97,15 @@ Running without arguments will suffice in most cases."
prefix=v prefix=v
fallback= fallback=
@ -23,12 +25,12 @@ Remove when integrated in Gnulib.
case $1 in case $1 in
--help) echo "$usage"; exit 0;; --help) echo "$usage"; exit 0;;
--version) echo "$version"; exit 0;; --version) echo "$version"; exit 0;;
--prefix) shift; prefix="$1";; --prefix) shift; prefix=${1?};;
+ --match) shift; match="$1";; + --match) shift; match="$1";;
--fallback) shift; fallback="$1";; --fallback) shift; fallback=${1?};;
-*) -*)
echo "$0: Unknown option '$1'." >&2 echo "$0: Unknown option '$1'." >&2
@@ -124,6 +129,7 @@ if test "x$tarball_version_file" = x; then @@ -125,6 +130,7 @@ if test "x$tarball_version_file" = x; then
exit 1 exit 1
fi fi
@ -36,7 +38,7 @@ Remove when integrated in Gnulib.
tag_sed_script="${tag_sed_script:-s/x/x/}" tag_sed_script="${tag_sed_script:-s/x/x/}"
nl=' nl='
@@ -154,7 +160,7 @@ then @@ -155,7 +161,7 @@ then
# directory, and "git describe" output looks sensible, use that to # directory, and "git describe" output looks sensible, use that to
# derive a version string. # derive a version string.
elif test "`git log -1 --pretty=format:x . 2>&1`" = x \ elif test "`git log -1 --pretty=format:x . 2>&1`" = x \