[OpenAFS-devel] Re: Error with first git push to gerrit
Phillip Moore
w.phillip.moore@gmail.com
Tue, 5 Oct 2010 16:06:28 -0400
--20cf300fb4294595940491e43244
Content-Type: text/plain; charset=ISO-8859-1
OK, I managed to successfully make my first contribution to OpenAFS, and the
Quick Start Guide for UNIX no sucks just a little less than it did
yesterday. Not my that much, though...
Question... since I submitted this to gerrit through a "git push" command,
and it has since been accepted and merged into origin/master by whatever
Russ and/or Derrick did, what do I do with the git branch I now have sitting
here that thinks it's out of date:
pmoore@Renegade$ git status
# On branch quick-start-guide-unix
# Your branch is ahead of 'origin/master' by 1 commit.
#
nothing to commit (working directory clean)
This is really a trivial git workflow question, but is everyone just
destroying the branches locally when they're done? I'm "done" with this
branch, since it was accepted and merged via gerrit.
Just curious how other deal with these....
On Tue, Oct 5, 2010 at 12:50 PM, Phillip Moore <w.phillip.moore@gmail.com>wrote:
>
> That was a bone-headed mistake on my part. I assumed I had changed my
> email address in my git config ages ago, and of course, I hadn't. Since I
> changed if *after* making the commit, the wrong name was embedded, and
> gerrit did not like this.
>
> Then I followed some bad advice I found, and totally hosed my git repo, so
> I just started over.
>
> I've managed to submit this first patch now. Now exactly an earth
> shattering patch, but it feels good to finally make a contribution again
> after about 8 years :-P
>
>
> On Tue, Oct 5, 2010 at 11:24 AM, Andrew Deason <adeason@sinenomine.net>wrote:
>
>> On Tue, 5 Oct 2010 10:22:52 -0400
>> Phillip Moore <w.phillip.moore@gmail.com> wrote:
>>
>> > It's not at all clear to me how this email is used in gerrit, or what
>> > I have to change to correct it.
>>
>> I imagine it compares the committer field to the email addresses you
>> have configured associated with your ssh key. 'Settings' -> 'Contact
>> Information' in gerrit is where email address stuff is.
>>
>> > How do I get around this?
>>
>> 'git commit --amend --reset-author' will set the author and committer to
>> who you currently are, I think.
>>
>> --
>> Andrew Deason
>> adeason@sinenomine.net
>>
>> _______________________________________________
>> OpenAFS-devel mailing list
>> OpenAFS-devel@openafs.org
>> https://lists.openafs.org/mailman/listinfo/openafs-devel
>>
>
>
--20cf300fb4294595940491e43244
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
<div><br></div>OK, I managed to successfully make my first contribution to =
OpenAFS, and the Quick Start Guide for UNIX no sucks just a little less tha=
n it did yesterday. =A0Not my that much, though...<div><br></div><div>Quest=
ion... =A0 since I submitted this to gerrit through a "git push" =
command, and it has since been accepted and merged into origin/master by wh=
atever Russ and/or Derrick did, what do I do with the git branch I now have=
sitting here that thinks it's out of date:=A0</div>
<div><br></div><div><div>pmoore@Renegade$ git status</div><div># On branch =
quick-start-guide-unix</div><div># Your branch is ahead of 'origin/mast=
er' by 1 commit.</div><div>#</div><div>nothing to commit (working direc=
tory clean)</div>
<div><br></div><div>This is really a trivial git workflow question, but is =
everyone just destroying the branches locally when they're done? =A0I&#=
39;m "done" with this branch, since it was accepted and merged vi=
a gerrit.</div>
<div><br></div><div>Just curious how other deal with these....</div><br><di=
v class=3D"gmail_quote">On Tue, Oct 5, 2010 at 12:50 PM, Phillip Moore <spa=
n dir=3D"ltr"><<a href=3D"mailto:w.phillip.moore@gmail.com">w.phillip.mo=
ore@gmail.com</a>></span> wrote:<br>
<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
x #ccc solid;padding-left:1ex;"><div><br></div>That was a bone-headed mista=
ke on my part. =A0I assumed I had changed my email address in my git config=
ages ago, and of course, I hadn't. =A0Since I changed if *after* makin=
g the commit, the wrong name was embedded, and gerrit did not like this.=A0=
<div>
<br></div><div>Then I followed some bad advice I found, and totally hosed m=
y git repo, so I just started over.</div><div><br></div><div>I've manag=
ed to submit this first patch now. =A0 Now exactly an earth shattering patc=
h, but it feels good to finally make a contribution again after about 8 yea=
rs :-P<div>
<div></div><div class=3D"h5"><br>
<div><br><div class=3D"gmail_quote">On Tue, Oct 5, 2010 at 11:24 AM, Andrew=
Deason <span dir=3D"ltr"><<a href=3D"mailto:adeason@sinenomine.net" tar=
get=3D"_blank">adeason@sinenomine.net</a>></span> wrote:<br><blockquote =
class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid=
;padding-left:1ex">
<div>On Tue, 5 Oct 2010 10:22:52 -0400<br>
Phillip Moore <<a href=3D"mailto:w.phillip.moore@gmail.com" target=3D"_b=
lank">w.phillip.moore@gmail.com</a>> wrote:<br>
<br>
> It's not at all clear to me how this email is used in gerrit, or w=
hat<br>
> I have to change to correct it.<br>
<br>
</div>I imagine it compares the committer field to the email addresses you<=
br>
have configured associated with your ssh key. 'Settings' -> '=
;Contact<br>
Information' in gerrit is where email address stuff is.<br>
<div><br>
> How do I get around this?<br>
<br>
</div>'git commit --amend --reset-author' will set the author and c=
ommitter to<br>
who you currently are, I think.<br>
<font color=3D"#888888"><br>
--<br>
Andrew Deason<br>
<a href=3D"mailto:adeason@sinenomine.net" target=3D"_blank">adeason@sinenom=
ine.net</a><br>
<br>
_______________________________________________<br>
OpenAFS-devel mailing list<br>
<a href=3D"mailto:OpenAFS-devel@openafs.org" target=3D"_blank">OpenAFS-deve=
l@openafs.org</a><br>
<a href=3D"https://lists.openafs.org/mailman/listinfo/openafs-devel" target=
=3D"_blank">https://lists.openafs.org/mailman/listinfo/openafs-devel</a><br=
>
</font></blockquote></div><br></div></div></div></div>
</blockquote></div><br></div>
--20cf300fb4294595940491e43244--