[FFmpeg-devel] [RFC][PATCH] version.sh: Include annotated tag in version string

Alexander Strasser eclipse7 at gmx.net
Fri Nov 29 18:56:03 CET 2013


On 2013-11-29 15:05 +0100, Nicolas George wrote:
> Le nonidi 9 frimaire, an CCXXII, Alexander Strasser a écrit :
> > Make it easier to loosely relate e.g. snapshot builds to releases.
> > 
> > Signed-off-by: Alexander Strasser <eclipse7 at gmx.net>
> > ---
> > 
> >   We have come across a complaint about the generated versions
> > identifier strings of random builds being not expressive enough.
> > 
> >   Please test to see the result and voice your opinion.
> > 
> >  version.sh | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/version.sh b/version.sh
> > index 8d084c2..ca55317 100755
> > --- a/version.sh
> > +++ b/version.sh
> > @@ -3,6 +3,7 @@
> 
> >  # check for git short hash
> >  if ! test "$revision"; then
> >      revision=$(cd "$1" && git describe --tags --match N 2> /dev/null)
> > +    revision=${revision}-$(cd "$1" && git describe | cut -d- -f1 2> /dev/null)
> >  fi
> 
> Looks absurd: you are in a branch where revision="", and you seem to be
> using that empty string as a prefix.

  It was empty but it is set in the line above and extended in
the line my patch added.

[...]

  Alexander
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20131129/a52abcc9/attachment.asc>


More information about the ffmpeg-devel mailing list