Mailing-List: contact dev-help@kafka.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@kafka.apache.org
Received-SPF: pass (nike.apache.org: domain of cryptcom@gmail.com designates
 209.85.215.51 as permitted sender)
MIME-Version: 1.0
In-Reply-To: 
 <CA+0Ze6q24_Eihjp4SFSCLpLzNZC-S=GN34vuuWW3CGqjo-o84g@mail.gmail.com>
References: 
 <CAOeJiJhu5_cOQynBhC0bJgerWuCuV2v=hyFfPWXAeCvwiWpBSg@mail.gmail.com>
	<CAFbh0Q1OxTzwkNpWUr+Eiixg7rKbB33o=+im6g5yOBk_nvJ3Ow@mail.gmail.com>
	<CANEBM31WHfukp9DP+X=0d=METceyGf01jUFOKdtY1DB8hAoabg@mail.gmail.com>
	<CAOeJiJhmSFJHWrpMz5yVo9_Vb9HSWkXm9aH+ftjkNdW9zkAQNQ@mail.gmail.com>
	<CANEBM31Nk-xJ2Xq+TyMfo7u+qdvjpDexm=OXeST0Usv3cA-_cA@mail.gmail.com>
	<CA+0Ze6q24_Eihjp4SFSCLpLzNZC-S=GN34vuuWW3CGqjo-o84g@mail.gmail.com>
Date: Sat, 5 Jan 2013 13:42:59 -0500
Message-ID: 
 <CANEBM32Z4TykMOiY7BsOTpnOhyMV2754+3bg=XRYyJR+9AdXKA@mail.gmail.com>
Subject: Re: git workflow
From: Joe Stein <cryptcom@gmail.com>
To: dev@kafka.apache.org
Content-Type: multipart/alternative; boundary=f46d0401f8e112367f04d28ef703

--f46d0401f8e112367f04d28ef703
Content-Type: text/plain; charset=ISO-8859-1

that did not work either

I can't even get the patch to apply from the latest trunk because of this
message of patch without email

so the patch is here
https://issues.apache.org/jira/secure/attachment/12563266/KAFKA-133.patch

I go through the steps on the git workflow

git clone https://git-wip-us.apache.org/repos/asf/kafka.git kafka
cd kafka
git fetch
git checkout trunk
//already on trunk
git apply --stat ../KAFKA-133.patch
//project/build.properties         |    2 +-
//project/build/KafkaProject.scala |   44
+++++++++++++++++++++-----------------
//2 files changed, 25 insertions(+), 21 deletions(-)
git apply --check ../KAFKA-133.patch
git am --signoff < ../KAFKA-133.patch
//Patch does not have a valid e-mail address.

my git --version = 1.8.0.3

now what is interesting is when I grab the patch using wget
https://issues.apache.org/jira/secure/attachment/12563266/KAFKA-133.patchinstead
of downloading it it through a browser I get "Patch format
detection failed." instead of the error saying "Patch does not have a valid
e-mail address"

I am guessing it is something I am doing wrong and could be doing different
but am interested to see where exactly the problem is.

any thoughts?  I gotta work on some code for work right will bang on this
later tonight again but if anyone can reproduce this same thing or not or
has an idea that would be great.

could just be the patch, but would prefer to fix the patch and review the
code change for what it is and communicate moving forward how to make
patches differently (if that is in fact the problem)

On Sat, Jan 5, 2013 at 12:38 PM, David Arthur <mumrah@gmail.com> wrote:

> You can amend the previous commit (as long as you havent pushed) with an
> author like "git --amend --author='...'"
>
> On Saturday, January 5, 2013, Joe Stein wrote:
>
> > I am getting the no email after doing
> >
> > git am --signoff < xyz.patch
> >
> > so nothing gets in to commit to set the author :(
> >
> > On Sat, Jan 5, 2013 at 12:30 AM, Jay Kreps <jay.kreps@gmail.com
> <javascript:;>>
> > wrote:
> >
> > > I have but I don't really know why. This format worked for me:
> > >   git commit --author='Bertrand Russell <brussell@cambridge.edu
> <javascript:;>
> > >'
> > >
> > >
> > > On Fri, Jan 4, 2013 at 8:35 PM, Joe Stein <cryptcom@gmail.com
> <javascript:;>>
> > wrote:
> > >
> > > > I started following this so far really helpful thanks!!
> > > >
> > > > Running into some issues reviewing someone's patch getting "Patch
> does
> > > not
> > > > have a valid e-mail address." googling to figure out what is wrong
> > > figure I
> > > > mention here if anyone bumped into this yet
> > > >
> > > > thnx
> > > >
> > > > On Thu, Jan 3, 2013 at 11:17 AM, Jun Rao <junrao@gmail.com
> <javascript:;>>
> > wrote:
> > > >
> > > > > Thanks for documenting this. Could you also add how to resolve
> > > conflicts
> > > > > during rebase?
> > > > >
> > > > > Jun
> > > > >
> > > > > On Wed, Jan 2, 2013 at 1:45 PM, Jay Kreps <jay.kreps@gmail.com
> <javascript:;>>
> > wrote:
> > > > >
> > > > > > I don't know about other people but I find git kind of
> confusing. I
> > > > > thought
> > > > > > it would be useful to try to document the normal workflow for
> > > different
> > > > > use
> > > > > > cases:
> > > > > > 1. Contributing a patch
> > > > > > 2. Reviewing and integrating a patch that is contributed
> > > > > > 3. Doing development as a committer
> > > > > > 4. Keeping a copy of your local work on github (since it doesn't
> > seem
> > > > > > Apache has a place to keep local backups of work in progress).
> > > > > >
> > > > > > https://cwiki.apache.org/confluence/display/KAFKA/Git+Workflow
> > > > > >
> > > > > > I would like to link this up from the contributor page to help
> > people
> > > > > > (including my future self). Objections?
> > > > > >
> > > > > > I am not a git expert, so any feedback to improve these recipes
> or
> > > bug
> > > > > > fixes (since I haven't tried everything) would be very much
> > > > appreciated.
> > > > > If
> > > > > > you are about to do one of the above things, try the recipe and
> see
> > > if
> > > > it
> > > > > > can be improved.
> > > > > >
> > > > > > Cheers,
> > > > > >
> > > > > > -Jay
> > > > > >
> > > > >
> > > >
> > > >
> > > >
> > > > --
> > > >
> > > > /*
> > > > Joe Stein
> > > > http://www.linkedin.com/in/charmalloc
> > > > Twitter: @allthingshadoop <http://www.twitter.com/allthingshadoop>
> > > > */
> > > >
> > >
> >
> >
> >
> > --
> >
> > /*
> > Joe Stein
> > http://www.linkedin.com/in/charmalloc
> > Twitter: @allthingshadoop <http://www.twitter.com/allthingshadoop>
> > */
> >
>
>
> --
> David Arthur
>


-- 

/*
Joe Stein
http://www.linkedin.com/in/charmalloc
Twitter: @allthingshadoop <http://www.twitter.com/allthingshadoop>
*/

--f46d0401f8e112367f04d28ef703--