[Telepathy] ANNOUNCE: folks 0.6.0

[Travis Reitter]

On Thu, 2011-08-18 at 19:07 +0100, Philip Withnall wrote:
> On Thu, 2011-08-18 at 18:14 +1000, Danielle Madeley wrote:
> > On Thu, 2011-08-18 at 07:56 +0100, Philip Withnall wrote:
> > > On Thu, 2011-08-18 at 10:19 +1000, Danielle Madeley wrote:
> > > > On Sat, 2011-08-13 at 18:50 +0200, Travis Reitter wrote:
> > > > > libfolks 0.6.0 is now available for download from:
> > > > 
> > > > Did you tag it off/push tags? I can't see the tag in git.
> > > 
> > > http://git.gnome.org/browse/folks/tag/?id=FOLKS_0_6_0 ?
> > 
> > Ok, what's going on here?
> > 
> > [danni at adelie folks]$ git remote -v
> > origin	ssh://git.gnome.org/git/folks (fetch)
> > origin	ssh://git.gnome.org/git/folks (push)
> > [danni at adelie folks]$ git remote update -p
> > Fetching origin
> > [danni at adelie folks]$ git tag | grep 0_6_0
> > <nothing>
> > 
> > Actually, there's something weird going on here. cgit tells me the
> > commit points to 6ae4bfa904ad9c0d1b660d6c2fec0161945a9d8f but
> > [danni at adelie folks]$ git log 6ae4bfa904ad9c0d1b660d6c2fec0161945a9d8f
> > fatal: bad object 6ae4bfa904ad9c0d1b660d6c2fec0161945a9d8f
> > 
> > I have this commit instead:
> > 
> >         commit fb0afc67b31c095bbb3916547cd66025a873078c
> >         Author: Travis Reitter <travis.reitter at collabora.co.uk>
> >         Date:   Sat Aug 13 13:12:22 2011 +0200
> >         
> >             Release version 0.6.0
> > 
> > And if you view http://git.gnome.org/browse/folks/log/ the tag doesn't
> > appear there either:
> > http://git.gnome.org/browse/folks/commit/?id=fb0afc67b31c095bbb3916547cd66025a873078c
> > 
> > Is the problem a bad tag pointing to a non-existent object?
> 
> My guess is that Travis pushed the tag, then tried to push the commits
> (including the tagged release commit) and found that they needed
> rebasing. After rebasing, the tag no longer pointed to the release
> commit. (Please correct me if I'm wrong, Travis.)

This is what happened (if I remember correctly):

1. made the tag FOLKS_0_6_0
2. realized I needed one more commit
3. deleted tag FOLKS_0_6_0
4. added last commit
5. (possibly) re-ordered commits not yet pushed
6. git tag -a FOLKS_0_6_0 <commit hash>
7. git push origin master FOLKS_0_6_0

I'd never pushed the original tag to origin, so I didn't anticipate any
trouble (and I still don't think anything above is wrong - please
correct me as necessary).

Thanks for pointing this out, Danielle and fixing this, Philip.

-Travis