maint.mk: restore functionality removed by recent change

Sunday's change, v0.0-8062-g6b24f60, may have appeared correct from
the context of a shallow-cloned gnulib repository: "git describe"
would fail in such a directory.  However, that change made it so
the reported gnulib revision no longer includes the version number
or a commit count, even when run from a full clone.
* top/maint.mk (gnulib-version): Use the full "git describe"
output when possible, e.g., the form above, rather than the
abbreviated, no-tag, no-commit-count string, and fall back to
using a 10-byte hash, rather than the default minimal-length
hash prefix, since while the minimal-length one may be fine today,
it is likely not to be unique for very long.

diff --git a/ChangeLog b/ChangeLog
index cf868ae..6fca0c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2013-10-28  Jim Meyering  <meyering@fb.com>
+
+       maint.mk: restore functionality removed by recent change...
+       Sunday's change, v0.0-8062-g6b24f60, may have appeared correct from
+       the context of a shallow-cloned gnulib repository: "git describe"
+       would fail in such a directory.  However, that change made it so
+       the reported gnulib revision no longer includes the version number
+       or a commit count, even when run from a full clone.
+       * top/maint.mk (gnulib-version): Use the full "git describe"
+       output when possible, e.g., the form above, rather than the
+       abbreviated, no-tag, no-commit-count string, and fall back to
+       using a 10-byte hash, rather than the default minimal-length
+       hash prefix, since while the minimal-length one may be fine today,
+       it is likely not to be unique for very long.
+

 2013-10-26  Jim Meyering  <meyering@fb.com>
 
        maint.mk: fix "release" target to build _version
 2013-10-26  Jim Meyering  <meyering@fb.com>
 
        maint.mk: fix "release" target to build _version

diff --git a/top/maint.mk b/top/maint.mk
index bf8f53a..8cb58f8 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1283,7 +1283,8 @@ vc-diff-check:
 rel-files = $(DIST_ARCHIVES)
 
 gnulib_dir ?= $(srcdir)/gnulib
 rel-files = $(DIST_ARCHIVES)
 
 gnulib_dir ?= $(srcdir)/gnulib

-gnulib-version = $$(cd $(gnulib_dir) && git rev-parse --short HEAD)
+gnulib-version = $$(cd $(gnulib_dir)                           \
+                    && { git describe || git rev-parse --short=10 HEAD; } )

 bootstrap-tools ?= autoconf,automake,gnulib
 
 # If it's not already specified, derive the GPG key ID from
 bootstrap-tools ?= autoconf,automake,gnulib
 
 # If it's not already specified, derive the GPG key ID from