[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.5-213-g24dd9f6

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=24dd9f6fe1449fa4de81d95ca659283c15e16931

The branch, stable-2.0 has been updated
       via  24dd9f6fe1449fa4de81d95ca659283c15e16931 (commit)
       via  ded42750d65cf976b8ff2874fcca5de91b2526cb (commit)
       via  826ce16e29822ed062b7f97a9b2ab3c589134b7c (commit)
      from  e1fb0e811bb1ca867a297d81fd82dd60f750bc19 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 24dd9f6fe1449fa4de81d95ca659283c15e16931
Author: Andy Wingo <address@hidden>
Date:   Fri Jul 6 16:13:57 2012 +0200

    add --match pattern to git-version-gen
    
    * configure.ac: Add --match pattern so we only get v2.0.x tagx.

commit ded42750d65cf976b8ff2874fcca5de91b2526cb
Author: Andy Wingo <address@hidden>
Date:   Fri Jul 6 15:51:05 2012 +0200

    git-version-gen: add --match argument
    
    * build-aux/git-version-gen (Options): Add --match argument.
      (v_from_git): Remove path without --match.

commit 826ce16e29822ed062b7f97a9b2ab3c589134b7c
Author: Andy Wingo <address@hidden>
Date:   Fri Jul 6 15:17:07 2012 +0200

    update git-version-gen from gnulib
    
    * build-aux/git-version-gen: Import from gnulib.

-----------------------------------------------------------------------

Summary of changes:
 build-aux/git-version-gen |   22 ++++++++++++++--------
 configure.ac              |    2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index d5542a2..0b51154 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2012-01-06.07; # UTC
+scriptversion=2012-07-06.14; # UTC
 
 # Copyright (C) 2007-2012 Free Software Foundation, Inc.
 #
@@ -85,18 +85,25 @@ Print a version string.
 
 Options:
 
-   --prefix           prefix of git tags (default 'v')
+   --prefix     prefix of git tags to strip from version (default 'v')
+   --match      pattern for git tags to match (default: '\$prefix*')
 
-   --help             display this help and exit
-   --version          output version information and exit
+   --help       display this help and exit
+   --version    output version information and exit
 
-Running without arguments will suffice in most cases."
+Running without arguments will suffice in most cases.  If no --match
+argument is given, only match tags that begin with the --prefix."
+
+prefix=v
+unset match
+unset tag_sed_script
 
 while test $# -gt 0; do
   case $1 in
     --help) echo "$usage"; exit 0;;
     --version) echo "$version"; exit 0;;
     --prefix) shift; prefix="$1";;
+    --match) shift; match="$1";;
     -*)
       echo "$0: Unknown option '$1'." >&2
       echo "$0: Try '--help' for more information." >&2
@@ -119,8 +126,8 @@ if test -z "$tarball_version_file"; then
     exit 1
 fi
 
+match="${match:-$prefix*}"
 tag_sed_script="${tag_sed_script:-s/x/x/}"
-prefix="${prefix:-v}"
 
 nl='
 '
@@ -150,8 +157,7 @@ then
 # directory, and "git describe" output looks sensible, use that to
 # derive a version string.
 elif test "`git log -1 --pretty=format:x . 2>&1`" = x \
-    && v=`git describe --abbrev=4 --match="$prefix*" HEAD 2>/dev/null \
-          || git describe --abbrev=4 HEAD 2>/dev/null` \
+    && v=`git describe --abbrev=4 --match="$match" HEAD 2>/dev/null` \
     && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \
     && case $v in
          $prefix[0-9]*) ;;
diff --git a/configure.ac b/configure.ac
index 5f98798..0eb937c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ Floor, Boston, MA 02110-1301, USA.
 AC_PREREQ(2.61)
 
 AC_INIT([GNU Guile],
-        m4_esyscmd([build-aux/git-version-gen .tarball-version]),
+        m4_esyscmd([build-aux/git-version-gen --match v2.0.\* 
.tarball-version]),
         address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])


hooks/post-receive
-- 
GNU Guile