Mailing-List: contact dev-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Received-SPF: pass (nike.apache.org: local policy includes SPF record at
 spf.trusted-forwarder.org)
Content-Type: text/plain; charset=windows-1252
Mime-Version: 1.0 (Mac OS X Mail 7.1 \(1827\))
Subject: Re: Discuss: Switching cxf to git
From: Daniel Kulp <dkulp@apache.org>
In-Reply-To: <52DFF976.1050608@die-schneider.net>
Date: Wed, 22 Jan 2014 12:18:27 -0500
Content-Transfer-Encoding: quoted-printable
Message-Id: <57CC5F7B-C19D-4BC1-9992-E384DBBA585E@apache.org>
References: <52DF8D55.7060403@die-schneider.net>
 <E91F38D1-1FD6-4484-8AB7-2A876694B5B3@apache.org>
 <52DFD73F.4050207@redhat.com>
 <429BB71A-F120-487B-9D6C-9871BEED15E1@apache.org>
 <52DFF976.1050608@die-schneider.net>
To: dev@cxf.apache.org


On Jan 22, 2014, at 12:01 PM, Christian Schneider =
<chris@die-schneider.net> wrote:

> There is one thing that might be different.
>=20
> I recently "committed/pushed" a change from a non committer to karaf. =
I proposed to the developer to fork the karaf repo on github and commit =
and push there. I then thought to use a github pull request but this =
probably would not have worked as the karaf repo at github is readonly. =
So I pulled his changes into my own checkout and pushed them to karaf at =
apache. So the commits still had his name in them. JB then told me that =
this is probably not allowed.

Personally, I prefer that as we then know exactly where that change came =
from.=20

> So the question is: how would the process look like for pull requests? =
Is it ok that the original non committer name is in the commit or do we =
have to avoid this?

Git does record the Author separate from the committer.  In theory, in =
this case, the two could be different.  I=92m just not sure how to make =
that happen.    A 'git log --pretty=3Dfuller=92  should produce both =
names.    I=92m not sure how you pulled the changes from github to cause =
both the committer and author to be the same.  Ideally, it would retain =
the author and put you in as committer, but it doesn=92t look like it =
did that for you.   We=92d have to experiment a bit.

That said, if you do the pull with =93=97squash=94 to squash it down =
into a single commit, that would also have your name I think.=20

Definitely getting into more advanced git stuff though.   I=92m not =
advanced enough with it to really know.  :-(

Dan


>=20
> Christian
>=20
> Am 22.01.2014 15:40, schrieb Daniel Kulp:
>> Anyone who is a committer will be able to =93push=94 changes into the =
canonical repo here at Apache. Honestly, for committers, you can use git =
just like you you git-svn or just svn today. Just instead of =93git svn =
dcommit=94 or =93svn commit=94 it would be a =93git push=94. If you =
don=92t want your workflow to change, you don=92t really need it to =
change. The commands are just a little different and many of the =
operations perform much faster.=20
>=20
>=20
> --=20
> Christian Schneider
> http://www.liquid-reality.de
>=20
> Open Source Architect
> Talend Application Integration Division http://www.talend.com
>=20

--=20
Daniel Kulp
dkulp@apache.org - http://dankulp.com/blog
Talend Community Coder - http://coders.talend.com