summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2007-08-30 23:13:06 +0200
committerJim Meyering <jim@meyering.net>2007-08-30 23:13:12 +0200
commit42a4957361cee5e3d5f8772daca0dddebc3162dc (patch)
tree2898d7613ef57fdc9d68f1475ccd789753ab0d8e
parent624d125ceec7b676a38a252f9c5c7e69f4ada8b5 (diff)
downloadcoreutils-42a4957361cee5e3d5f8772daca0dddebc3162dc.tar.xz
Shorten the snapshot version string by removing the "g".
* build-aux/git-version-gen: Remove git-describe's "g" that would always precede the abbreviated SHA1. Suggestion from Dmitry V. Levin.
-rw-r--r--ChangeLog4
-rwxr-xr-xbuild-aux/git-version-gen3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a64363675..a5b1c8bfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-08-30 Jim Meyering <jim@meyering.net>
+ Shorten the snapshot version string by removing the "g".
+ * build-aux/git-version-gen: Remove git-describe's "g" that would
+ always precede the abbreviated SHA1. Suggestion from Dmitry V. Levin.
+
Perform the s,rm,/bin/rm, fix-up properly. No more kludge.
* Makefile.am (EXTRA_DIST): Remove .kludge-stamp.
(.kludge-stamp): Remove rule. Instead, ...
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 4a631116b..0fe5f3688 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -38,7 +38,8 @@ elif test -d .git \
*) (exit 1) ;;
esac
then
- v=`echo "$v" | sed 's/-/./g'`;
+ # Remove the "g" in git-describe's output string; change each - to a '.'
+ v=`echo "$v" | sed 's/\(.*\)-g/\1-/;s/-/./g'`;
else
v=$default_version
fi