[oe] Git Migration Status

[Cliff Brake]

On Wed, Jul 30, 2008 at 10:28 AM, Richard Purdie <rpurdie at rpsys.net> wrote:
> On Wed, 2008-07-30 at 09:07 -0400, Philip Balister wrote:
>> Otavio Salvador wrote:
>> > "Cliff Brake" <cliff.brake at gmail.com> writes:
>> >
>> >> Using real email addresses would also simplify server admin and be one
>> >> less load on the server.  When the spam starts flowing, this can
>> >> require a significant amount of network bandwidth.  Where I host my
>> >> main web site and domain, the owner claims spam to email accounts is
>> >> by far the greatest use of bandwidth, and he spends a lot of time
>> >> implementing anti-spam measures.  With limited resources, simple is
>> >> good!
>> >
>> > +1
>> >
>>
>> I also agree. I would prefer to commit with my own address. I own all
>> the domains, so they should last as long as I do.
>
> Before we all start jumping on this wagon let me explain some of the
> background to what I proposed. I was trying to keep that announcement
> brief and it assumes some understanding of git so let me explain
> further:

Thanks for explaining -- this provoked me to do a little more digging ...

We have a nomenclature issue -- "commit id" is typically referred to
in the git documentation as the hash that defines a particular commit,
so perhaps "committer" is slightly more correct.  Being on the doc
team, I guess I'm supposed to be picky about stuff like this :-)

The following docs give a little more information:

http://www.kernel.org/pub/software/scm/git/docs/git-config.html
http://www.kernel.org/pub/software/scm/git/docs/git-commit-tree.html

GIT_AUTHOR_NAME
GIT_AUTHOR_EMAIL
GIT_AUTHOR_DATE
GIT_COMMITTER_NAME
GIT_COMMITTER_EMAIL
GIT_COMMITTER_DATE

Is env variables the only way to set these to be different than user.*?

The following commands:

git log --pretty=raw
git show --pretty=raw

can be used to show both committer and author id.  gitk also shows
both author and committer ID.

One thing that is useful is to be able to figure out who might have
merged a change from another branch.  For example, I could have my own
git repo where all the commit IDs are my ID (oops, I meant
committer!!!!).  Someone else could merge this repo into the master OE
repo.  In this case, the committer ID for a particular commit does not
tell you who decided to merge my branch into the master OE repo, as my
committer ID will still be listed in the commits.  You have to follow
a graph of all the merges to know for sure what happened.

There are several ways to view this:

git log --branch ... (my version of git does not have this :-(  )
gitk $commit_id..$branch_name

The second option shows a simple graphical view of how something got
into a branch and all the merge points.  The more I mess with git, the
more impressed I am that you can just try stuff like "gitk
$commit_id..$branch_name", and it just works.

Cliff

-- 
=======================
Cliff Brake
http://bec-systems.com