How we use Git

[Mark Côté]

On 2014-11-03 9:24 AM, Gervase Markham wrote:
> On 03/11/14 14:13, Mark Côté wrote:
>> 1. The name of the release is 4.4, not 4.4.0.
> 
> That would be a reason to tag as 4.4.0 in addition, rather than instead
> of, 4.4.

Sure, that still strikes me as slightly confusing (browsing the list of
tags, seeing "bugzilla-4.4.0", then looking at release list and not
seeing it).  But less so than not taking bugzilla-4.4 at all.  However,
see my proposal at the bottom of this post.

>> 2. bugzilla-4.4 is a tag, whereas 4.4 is a branch.  
> 
> That is true. However, it seems from previous conversations that git
> uses git checkout --branch to pull both. I'm just saying it may not be
> obvious to a new Bugzilla admin that:
> 
> git checkout --branch bugzilla-4.4
> 
> gives you the checkout of a tag, which doesn't move, but:
> 
> git checkout --branch 4.4
> 
> gives you a branch, which does.

Wellllll sorta.  Branches and tags are almost the exact same thing in
git.  The difference is that the latter (--branch 4.4) takes you to the
*HEAD* of the 4.4 branch.  Essentially, "4.4" is a movable tag that
always points to the last commit in that branch (the HEAD), whereas
"bugzilla-4.4" is always frozen to a particular commit.

You can see how the two ideas bleed over when you try checking out a
remote branch, e.g. 'git checkout <origin>/<branch>'; although you are
checking out someone's *branch*, since it's remote you can't add to it,
so you are given the same "detached head" warning (you have to create a
local branch to do commits).  But I digress. :)

Maybe a lot of confusion would be eliminated by using the tag name
"release-4.4" instead of "bugzilla-4.4".  Really, "bugzilla" is pretty
redundant in tag names.  I would be up for doing that (we can also
retroactively apply that tag name, though we'd want to leave the old
style in there as well for existing releases).

Mark

_______________________________________________
dev-apps-bugzilla mailing list
dev-apps-bugzilla at lists.mozilla.org
https://lists.mozilla.org/listinfo/dev-apps-bugzilla