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

Jason Garrett-Glaser jason
Mon Dec 27 23:27:49 CET 2010

On Mon, Dec 27, 2010 at 1:34 PM, Reinhard Tartler <siretart at tauware.de> wrote:
> On Mon, Dec 27, 2010 at 18:10:36 (CET), Michael Niedermayer wrote:
>> 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 scheme doesn't look very "git-ish". It is probably very non-trivial
> to implement and is likely to confuse people familar to the version
> tagging conventions of other projects that use git.

x264 uses a monotonically increasing version number as well.  There's
no sane reason *not* to have one, especially if you're going to
include the git hash anyways.


More information about the ffmpeg-devel mailing list