diff options
| author | Jim Meyering <meyering@redhat.com> | 2011-01-03 20:41:49 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2011-01-03 20:41:49 +0100 |
| commit | 307d43494913d332a425e6d384142aed28536e53 (patch) | |
| tree | 0419d394b670ea8966f9b1ab9d192be587a1ad6c /build-aux/git-version-gen | |
| parent | 98e2bedbc92b816b68ee8092224b1e11f37b6596 (diff) | |
| download | gnulib-307d43494913d332a425e6d384142aed28536e53.tar.gz | |
git-version-gen: convert leading TABs to spaces
* build-aux/git-version-gen: Expand leading TABs.
Diffstat (limited to 'build-aux/git-version-gen')
| -rwxr-xr-x | build-aux/git-version-gen | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index dd893f9e4d..f116ba1389 100755 --- 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. |