FYI: accommodate upcoming git-COMMAND deprecation

[Jim Meyering]

2008-02-08  Jim Meyering  <address@hidden>

        Use "git COMMAND", not "git-COMMAND".
        * build-aux/bootstrap (version_controlled_file): s/git-rm/git-rm/.
        * build-aux/announce-gen (get_tool_versions): Correct a diagnostic.
        * build-aux/git-version-gen: Use "git status", not "git-status".

diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 67ed3ea..1d58adc 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2007-11-05.08
+scriptversion=2008-02-08.11

 # Copyright (C) 2007 Free Software Foundation
 #
@@ -21,10 +21,10 @@ scriptversion=2007-11-05.08

 # This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
 # It may be run two ways:
-# - from a git repository in which the git-describe command below
+# - from a git repository in which the "git describe" command below
 #   produces useful output (thus requiring at least one signed tag)
 # - from a non-git-repo directory containing a .version file, which
-#   presumes this script is invoked like "./git-version-gen .version".
+#   presumes this script is invoked like "./git-version-gen .tarball-version".

 case $# in
     1) ;;
@@ -36,7 +36,7 @@ nl='
 '

 # First see if there is a tarball-only version file.
-# then try git-describe, then default.
+# then try "git describe", then default.
 if test -f $tarball_version_file
 then
     v=`cat $tarball_version_file` || exit 1
@@ -60,7 +60,7 @@ elif test -d .git \
        esac
 then
     # Change the first '-' to a '.', so version-comparing tools work properly.
-    # Remove the "g" in git-describe's output string, to save a byte.
+    # Remove the "g" in git describe's output string, to save a byte.
     v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
 else
     v=UNKNOWN
@@ -69,7 +69,7 @@ fi
 v=`echo "$v" |sed 's/^v//'`

 # Don't declare a version "dirty" merely because a time stamp has changed.
-git-status > /dev/null 2>&1
+git status > /dev/null 2>&1

 dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
 case "$dirty" in
diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index 9248876..c642ef8 100755
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 # Generate a release announcement message.

-my $VERSION = '2008-01-12 08:52'; # UTC
+my $VERSION = '2008-02-08 10:34'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -413,7 +413,7 @@ sub get_tool_versions ($$)

   grep (/^gnulib$/, @tool_list) ^ defined $gnulib_version
     and (warn "$ME: when specifying gnulib as a tool, you must also specify\n"
-       . "--gnulib-version=V, where V is the result of running git-describe\n"
+       . "--gnulib-version=V, where V is the result of running git describe\n"
        . "in the gnulib source directory.\n"), $fail = 1;

   exists $valid_release_types{$release_type}
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 88bd796..6fa1553 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -2,7 +2,7 @@

 # Bootstrap this package from checked-out sources.

-# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2003-2008 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -408,7 +408,7 @@ version_controlled_file() {
     grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
             grep '^/[^/]*/[0-9]' > /dev/null && found=yes
   elif test -d .git; then
-    git-rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
+    git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
   else
     echo "$0: no version control for $dir/$file?" >&2
   fi
--
1.5.4.35.g3cfc