Re: How we use Git

I would do...

cd bugzilla

# hum, what is new today?
git fetch

# hum what tags are there (in case i missed reading the output of git fetch)
git tags

# hum what branches are still alive?
git branches -a

# I want that one for some reason.
git checkout bugzilla-4.4.6

...

# let's get to business.
git checkout -b werk origin/4.4
git add ...
git commit ...

# reviews.
# more hacking
# ...
# done
git push origin werk:origin/4.4




On Fri, Oct 31, 2014 at 3:10 PM, Michiel Beijen <[email protected]>
wrote:

> Hi,
>
> On Fri, Oct 31, 2014 at 7:29 PM, Mark Côté <[email protected]> wrote:
> >
> > On 2014-10-31 7:26 AM, Gervase Markham wrote:
> > > A quick quiz:
> > >
> > > Q1: What git commands would I use to obtain an exact copy of 4.4.6 from
> > > our git repo?
> > >
> > > Q2: Same question for 4.4.4.
>
> > Regarding Randall's message, we could branch for every release; indeed,
> > given git's very light-weight approach to branches, there are many
> > strategies for developing under git.  However, given our relatively
> > small change volume, I don't think it's worth the extra overhead, at the
> > moment at least.
>
> I don't think there would be any additional benefit for having
> branches over tags for releases. I think tags are actually beneficial
> since they are *fixed* i.e. they can not change over time (as with a
> release, which you create at one given day and then it's out of the
> door, as with the 4.4.4 release) whereas the branch has the
> possibility of future releases: you might want to check out the branch
> of 4.4 to work on it to create 4.4.7 one day. And if you want to go
> back to 4.4.4 or 3.2.whatever then you can still check out the tag,
> create a branch from that point with your patch, or perform your test,
> and it would work.
>
> Git also has the notion of signed tags so you can cryptographically
> guarantee a tag is exact *this* version of the project, and the source
> has not been messed with. Although I think I don't know many projects
> that actually use this feature. Usually a sha1 of a tarbal is deemed
> enough.
>
> If you have a reasonably new git (1.8) you can even clone a repo at a
> given tag. So your question above would be answered with:
>
> git clone --branch bugzilla-4.4.6 http://git.mozilla.org/bugzilla/bugzilla
>
> BTW the answer of your initial question is also mentioned on this
> page: https://wiki.mozilla.org/Bugzilla:Git#Getting_A_Specific_Release
>
> --
> Mike
> _______________________________________________
> dev-apps-bugzilla mailing list
> dev-apps-bugzilla-CzyLcWPZiU5YsZ3hbOqMTti2O/[email protected]
> https://lists.mozilla.org/listinfo/dev-apps-bugzilla
> -
> To view or change your list settings, click here:
> <http://bugzilla.org/cgi-bin/mj_wwwusr?user=gcbd-developers-Uylq5CNFT+jYtjvyW6yDsg@public.gmane.org>
>