do_bloom(): remove unused "count" variable

[bup.git] / format-subst.pl

diff --git a/format-subst.pl b/format-subst.pl
index e04e1238965d67c98b901d4f6de8eea3018866f0..8a331bff2942008869476064f603feac82fbcbe1 100755 (executable)
--- a/format-subst.pl
+++ b/format-subst.pl
@@ -8,18 +8,25 @@ sub fix($) {
     return $s;
 }
 
+sub ex
+{
+  my ($cmd) = @_;
+  my $result = `$cmd` or die 'FAILED: ' . $cmd;
+  return $result;
+}
+
 while (<>) {
     s{
        \$Format:\%d\$
     }{
-       my $tag = fix(`git describe --match="bup-*"`);
-       "(tag: $tag)"
+       my $tag = fix(ex('git describe --match="[0-9]*"'));
+       "(tag: bup-$tag)"
     }ex;
     
     s{ 
        \$Format:([^\$].*)\$
     }{
-       fix(`git log -1 --format="$1"`)
+       fix(ex("git log -1 --pretty=format:'$1'"))
     }ex;
     print;
 }