From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Vilain Subject: Re: [PATCH] Make sure an autogenerated version has at least four parts Date: Fri, 25 May 2007 13:42:57 +1200 Message-ID: <46563F21.2060107@vilain.net> References: <11797159411969-git-send-email-sam.vilain@catalyst.net.nz> <20070521073650.GV5412@admingilde.org> <46563CE1.9020007@vilain.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Junio C Hamano , git@vger.kernel.org To: Martin Waitz X-From: git-owner@vger.kernel.org Fri May 25 03:49:45 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1HrOw5-00078o-ES for gcvg-git@gmane.org; Fri, 25 May 2007 03:49:45 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752435AbXEYBtn (ORCPT ); Thu, 24 May 2007 21:49:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752528AbXEYBtn (ORCPT ); Thu, 24 May 2007 21:49:43 -0400 Received: from watts.utsl.gen.nz ([202.78.240.73]:54685 "EHLO magnus.utsl.gen.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752435AbXEYBtn (ORCPT ); Thu, 24 May 2007 21:49:43 -0400 X-Greylist: delayed 884 seconds by postgrey-1.27 at vger.kernel.org; Thu, 24 May 2007 21:49:42 EDT Received: by magnus.utsl.gen.nz (Postfix, from userid 1003) id A69D313A384; Fri, 25 May 2007 13:49:41 +1200 (NZST) FCC: imap://sam@localhost/INBOX/Sent X-Identity-Key: id4 X-Mozilla-Draft-Info: internal/draft; vcard=0; receipt=0; uuencode=0 User-Agent: Thunderbird 1.5.0.10 (X11/20070307) In-Reply-To: <46563CE1.9020007@vilain.net> X-Enigmail-Version: 0.94.2.0 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: I wrote: > 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 --- 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