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

Janne Grunau janne-ffmpeg
Wed Dec 15 11:18:45 CET 2010

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.

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.


More information about the ffmpeg-devel mailing list