Re: [PATCH] Make sure an autogenerated version has at least four parts
- From
Sam Vilain <sam@vilain.net>
- Date
- May 25, 2007, 01:42 UTC
- Message-ID
- <46563F21.2060107@vilain.net>
- In-Reply-To
- <46563CE1.9020007@vilain.net>
I wrote:
Show 7 quoted lines
> dpkg uses "-" in version numbers for its own uses - to delimit the > packager's packaging version from the software version. The change I > posted keeps original behaviour - just fills out the .0's. > > Perhaps the munging should go in git-describe instead? > > Subject: [PATCH] describe: add --levels option
...and here's the corresponding GIT-VERSION-GEN patch:
Subject: [PATCH] Make sure an autogenerated version has at least four parts
Otherwise, a custom "v1.5.2.42.gd00b" is considered newer than a "v1.5.2.1.69.gcafe".
Contains a workaround for the chicken-and-egg problem it would otherwise introduce.
Signed-off-by: Sam Vilain <sam@vilain.net> --- GIT-VERSION-GEN | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 06c360b..91e8966 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -12,7 +12,8 @@ if test -f version then VN=$(cat version) || VN="$DEF_VER" elif test -d .git && - VN=$(git describe --abbrev=4 HEAD 2>/dev/null) && + VN=$(git describe --abbrev=4 --levels=4 HEAD 2>/dev/null || + git describe --abbrev=4 HEAD 2>/dev/null) && case "$VN" in *$LF*) (exit 1) ;; v[0-9]*) : happy ;;
-- 1.5.2.0.45.gfea6d-dirty