diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-10-22 13:10:30 +0000 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-10-22 13:34:00 +0000 |
| commit | 2d4da30fdefbcdb065d4b1f48f2a77d06f69e3c3 (patch) | |
| tree | 3f50180297054aeecd0b478e5f7260366b304c71 /gnulib-local | |
| parent | 139ef2d17c98488fc8e5444bf642699f2ad09e08 (diff) | |
Update Gnulib to v0.1-603-g1d16a7b
Diffstat (limited to 'gnulib-local')
| -rw-r--r-- | gnulib-local/build-aux/git-version-gen.diff | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnulib-local/build-aux/git-version-gen.diff b/gnulib-local/build-aux/git-version-gen.diff index f875f49d9..e15acf336 100644 --- a/gnulib-local/build-aux/git-version-gen.diff +++ b/gnulib-local/build-aux/git-version-gen.diff @@ -4,15 +4,15 @@ Remove when integrated in Gnulib. --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen -@@ -86,6 +86,7 @@ Print a version string. +@@ -86,6 +86,7 @@ Options: - --prefix prefix of git tags (default 'v') + --prefix PREFIX prefix of git tags (default 'v') + --match pattern for git tags to match (default: '\$prefix*') - --fallback fallback version to use if \"git --version\" fails + --fallback VERSION + fallback version to use if \"git --version\" fails - --help display this help and exit -@@ -96,11 +97,15 @@ Running without arguments will suffice in most cases." +@@ -97,11 +98,15 @@ prefix=v fallback= @@ -28,7 +28,7 @@ Remove when integrated in Gnulib. --fallback) shift; fallback="$1";; -*) echo "$0: Unknown option '$1'." >&2 -@@ -124,6 +129,7 @@ if test "x$tarball_version_file" = x; then +@@ -125,6 +130,7 @@ exit 1 fi @@ -36,7 +36,7 @@ Remove when integrated in Gnulib. tag_sed_script="${tag_sed_script:-s/x/x/}" nl=' -@@ -154,7 +160,7 @@ then +@@ -155,7 +161,7 @@ # directory, and "git describe" output looks sensible, use that to # derive a version string. elif test "`git log -1 --pretty=format:x . 2>&1`" = x \ |