[FFmpeg-devel] [PATCH] Use git describe in version.sh

Michael Niedermayer michaelni
Mon Dec 27 18:10:36 CET 2010

On Wed, Dec 15, 2010 at 11:18:45AM +0100, Janne Grunau wrote:
> On Wed, Dec 15, 2010 at 12:45:18AM -0200, Ramiro Polla wrote:
> > Hi,
> > 
> > Attached patch makes version.sh use git describe for version string.
> > Currently it will give the same result, since we have no tags in the
> > git tree.
> patch looks good
> > And this brings another issue: I'd like for FFmpeg to still have some
> > sort of monotonically increasing revision number when we switch to
> > git. If we add tags to the tree, we'll get better version strings like
> > "versionX-3-g9c2d982", where versionX is the tag name, 3 is the number
> > of commits since the tag, and g9c2d982 the short git hash. We have to
> > decide on what to tag though, since the releases are tagged after
> > branching.
> I would prefer tagging releases on master and branch afterwards but I don't
> think we'll agree on that.

IMO releases should use the revission number from where they where branched off
in their revission identifer (like r12653-pre-0.7-githash)
not devel HEAD using release versions+something but rather (r12653-githash)

> That leaves 3 options:
> 1) Tag the root commit and have something like svn rev numbers
> 2) Tag the commit immediately after branching for the next release and
>    tag as pre-0.7 for example.
> 3) Tag at specific date, we could for example tag the first commit of a
>    year as 2011 and have increasing numbers from that.
> I like 3) since it already gives an approximate age of the version and
> keeps the monotonically increasing number limited to 4 digits which is
> easier to remember than 5/6 digit numbers like the svn revisions.

If you want something easier to remember try using more than 10 chars
with lower case letters and numbers you can fit 46k revissions in 3 chars
and 4 should be enough until we switch vcs again

Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I know you won't believe me, but the highest form of Human Excellence is
to question oneself and others. -- Socrates
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20101227/3a05379d/attachment.pgp>

More information about the ffmpeg-devel mailing list