git-version-gen: convert leading TABs to spaces

* build-aux/git-version-gen: Expand leading TABs.

diff --git a/ChangeLog b/ChangeLog
index 88ed95367def0082c67d768a3b6e94c66cfeb370..97e911bd09d63dc3c0fd358f02fdcfb164b66bb2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-01-03  Jim Meyering  <meyering@redhat.com>
 
+       git-version-gen: convert leading TABs to spaces
+       * build-aux/git-version-gen: Expand leading TABs.
+
        git-version-gen: handle failed "git rev-list"
        * build-aux/git-version-gen: Rather than leaking a "fatal" error
        from git and proceeding as if it had succeeded but printed no SHA1

diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index dd893f9e4d0d5c4b7a6c571fab208733d764a78c..f116ba1389fe646c2297a8fb8dc7a1d343a46409 100755 (executable)
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2011-01-03.18; # UTC
+scriptversion=2011-01-03.19; # UTC
 
 # Copyright (C) 2007-2011 Free Software Foundation, Inc.
 #
@@ -87,12 +87,12 @@ if test -f $tarball_version_file
 then
     v=`cat $tarball_version_file` || v=
     case $v in
-       *$nl*) v= ;; # reject multi-line output
-       [0-9]*) ;;
-       *) v= ;;
+        *$nl*) v= ;; # reject multi-line output
+        [0-9]*) ;;
+        *) v= ;;
     esac
     test -z "$v" \
-       && echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2
+        && echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2
 fi
 
 if test -n "$v"
@@ -103,11 +103,11 @@ then
 # derive a version string.
 elif test "`git log -1 --pretty=format:x . 2>&1`" = x \
     && v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
-         || git describe --abbrev=4 HEAD 2>/dev/null` \
+          || git describe --abbrev=4 HEAD 2>/dev/null` \
     && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \
     && case $v in
-        v[0-9]*) ;;
-        *) (exit 1) ;;
+         v[0-9]*) ;;
+         *) (exit 1) ;;
        esac
 then
     # Is this a new git that lists number of commits since the last
@@ -115,20 +115,20 @@ then
     #   Newer: v6.10-77-g0f8faeb
     #   Older: v6.10-g0f8faeb
     case $v in
-       *-*-*) : git describe is okay three part flavor ;;
-       *-*)
-           : git describe is older two part flavor
-           # Recreate the number of commits and rewrite such that the
-           # result is the same as if we were using the newer version
-           # of git describe.
-           vtag=`echo "$v" | sed 's/-.*//'`
-           commit_list=`git rev-list "$vtag"..HEAD 2>/dev/null` \
-               || { commit_list=failed;
-                    echo "$0: WARNING: git rev-list failed" 1>&2; }
-           numcommits=`echo "$commit_list" | wc -l`
-           v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
-           test "$commit_list" = failed && v=UNKNOWN
-           ;;
+        *-*-*) : git describe is okay three part flavor ;;
+        *-*)
+            : git describe is older two part flavor
+            # Recreate the number of commits and rewrite such that the
+            # result is the same as if we were using the newer version
+            # of git describe.
+            vtag=`echo "$v" | sed 's/-.*//'`
+            commit_list=`git rev-list "$vtag"..HEAD 2>/dev/null` \
+                || { commit_list=failed;
+                     echo "$0: WARNING: git rev-list failed" 1>&2; }
+            numcommits=`echo "$commit_list" | wc -l`
+            v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
+            test "$commit_list" = failed && v=UNKNOWN
+            ;;
     esac
 
     # Change the first '-' to a '.', so version-comparing tools work properly.
@@ -147,10 +147,10 @@ dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
 case "$dirty" in
     '') ;;
     *) # Append the suffix only if there isn't one already.
-       case $v in
-         *-dirty) ;;
-         *) v="$v-dirty" ;;
-       esac ;;
+        case $v in
+          *-dirty) ;;
+          *) v="$v-dirty" ;;
+        esac ;;
 esac
 
 # Omit the trailing newline, so that m4_esyscmd can use the result directly.