Always pass --always to git-describe

Without this the build might fail if the git history is short enough,
perhaps via a shallow clone.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/Makefile b/Makefile
index b129a7e08f1818770d0d213c972bb139498ca80a..1870a87533946d9d23b33ca2bd0ee5a6f93a07b1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -153,13 +153,13 @@ export-docs: Documentation/all
        rm -f $${GIT_INDEX_FILE} && \
        git add -f Documentation/*.1 && \
        git update-ref refs/heads/man \
-               $$(echo "Autogenerated man pages for $$(git describe)" \
+               $$(echo "Autogenerated man pages for $$(git describe --always)" \
                    | git commit-tree $$(git write-tree --prefix=Documentation) \
                                -p refs/heads/man) && \
        rm -f $${GIT_INDEX_FILE} && \
        git add -f Documentation/*.html && \
        git update-ref refs/heads/html \
-               $$(echo "Autogenerated html pages for $$(git describe)" \
+               $$(echo "Autogenerated html pages for $$(git describe --always)" \
                    | git commit-tree $$(git write-tree --prefix=Documentation) \
                                -p refs/heads/html)
 

diff --git a/format-subst.pl b/format-subst.pl
index 8a331bff2942008869476064f603feac82fbcbe1..42b255dc278984395ac674027ac3a611cfda94e9 100755 (executable)
--- a/format-subst.pl
+++ b/format-subst.pl
@@ -19,7 +19,7 @@ while (<>) {
     s{
        \$Format:\%d\$
     }{
-       my $tag = fix(ex('git describe --match="[0-9]*"'));
+       my $tag = fix(ex('git describe --always --match="[0-9]*"'));
        "(tag: bup-$tag)"
     }ex;