[Bf-committers] Are our git tags out of date?

[Trouble Daemon]

Hey,

I see. Well, from local tests here, the problem will go away the next time
a `git tag -a` is run:

  dan at wks:~/blender-build/testgit$ git describe master
  v2.70-1-g4eac1c8
  dan at wks:~/blender-build/testgit$ vim GNUmakefile
  dan at wks:~/blender-build/testgit$ git commit -a
  [master fcafbfd] Undo last test commit
   1 file changed, 1 deletion(-)
  dan at wks:~/blender-build/testgit$ git describe master
  v2.70-2-gfcafbfd

Interesting that it has a handy auto increment field between the tag name
and the hash. While we are on the topic of tags though, I was wondering
when the tags will be applied. My assumption is that the next RC will be
the start of this? Also, once the tags are back working again, will we
switch to using this "describe" output as the splash screens version number?


Dan



On Sun, Nov 24, 2013 at 9:11 AM, Sergey Sharybin <sergey.vfx at gmail.com>wrote:

> git describe master gives latest tag which is reachable from the HEAD
> of master branch. And the thing is: in svn we've created a tag from
> trunk and backported several commits there before actual release.
>
> What happened during svn->git converts is that every release have own
> branch created at the same moment as tag happend in svn. Then all the
> revision were backported to git branch. Tag was created in git branch
> and it totally corresponds state of svn state.
>
> Such tags for sure are not reachable from the master branch and that's
> why you can not see them with git describe. Not a bug, just different
> in how tags are handled in svn and git. Nothing to worry about i'd
> say.
>
> On Sat, Nov 23, 2013 at 6:52 PM, Dan McGrath <danmcgrath.ca at gmail.com>
> wrote:
> > While watching an advanced git video (which btw, is a nice follow up to
> the
> > Git video by Scott from the other day):
> >
> >   https://www.youtube.com/watch?v=ig5E8CcdM9g
> >
> > I noticed that when he got to the section on tags vs. annotated tags
> (~30+
> > minutes in, iirc), that the command:
> >
> >   git describe master
> >
> > gave the output:
> >
> >   v2.66-6202-g2cb6348
> >
> > This got me to thinking that maybe we are missing a few annotated tags
> (git
> > tag -a <rev>) in the repo?
> >
> > Anyways, just something I noticed and thought that I would inquire about,
> > and also to point out an amazing advanced git video! o/
> >
> >
> > Dan
> > _______________________________________________
> > Bf-committers mailing list
> > Bf-committers at blender.org
> > http://lists.blender.org/mailman/listinfo/bf-committers
>
>
>
> --
> With best regards, Sergey Sharybin
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers
>