summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rwxr-xr-xbuild-aux/git-version-gen4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 087ed774c..c64c68fd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2007-09-03 Jim Meyering <jim@meyering.net>
+ Don't change '-'s to '.'s in the string from git-describe.
+ * build-aux/git-version-gen: Leave '-'s in the string from git-describe.
+ Otherwise, s/-/./g would make it too hard to distinguish the base
+ version number from the appended .DD suffixes.
+
+2007-09-03 Jim Meyering <jim@meyering.net>
+
* README-hacking: Require rsync, rather than wget.
2007-09-02 Jim Meyering <jim@meyering.net>
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 0fe5f3688..a3e95aca6 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -38,8 +38,8 @@ elif test -d .git \
*) (exit 1) ;;
esac
then
- # Remove the "g" in git-describe's output string; change each - to a '.'
- v=`echo "$v" | sed 's/\(.*\)-g/\1-/;s/-/./g'`;
+ # Remove the "g" in git-describe's output string.
+ v=`echo "$v" | sed 's/\(.*\)-g/\1-/'`;
else
v=$default_version
fi