[OpenAFS-devel] Gerrit/git mistake

[Phillip Moore]

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

This doesn't look right...

pmoore@Renegade$ git push
ssh://gerrit.openafs.org/openafs.gitHEAD:refs/for/master
Counting objects: 16, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (7/7), done.
Writing objects: 100% (7/7), 1.17 KiB, done.
Total 7 (delta 4), reused 0 (delta 0)

New Changes:
  http://gerrit.openafs.org/3003
  http://gerrit.openafs.org/3004
  http://gerrit.openafs.org/3005

To ssh://gerrit.openafs.org/openafs.git
 * [new branch]      HEAD -> refs/for/master

That should have been one simple change, but before creating the topic
branch, I think (I'm not sure -- I did this a few days ago) I just did "git
pull" to update my copy of master.

Was that the wrong way to stay in sync?  Am I supposed to be using rebase
instead?

Looking at gerrit, two of those "changes" are empty, and the most recent one
has the fs getfid patch I thought I was submitting.

Can someone let me know what I did wrong, so I can avoid the same mistake in
the future?

--20cf300fb42df515350492f788d0
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

This doesn&#39;t look right...<div><br></div><div><div>pmoore@Renegade$ git=
 push ssh://<a href=3D"http://gerrit.openafs.org/openafs.git">gerrit.openaf=
s.org/openafs.git</a> HEAD:refs/for/master</div><div>Counting objects: 16, =
done.</div>
<div>Delta compression using up to 2 threads.</div><div>Compressing objects=
: 100% (7/7), done.</div><div>Writing objects: 100% (7/7), 1.17 KiB, done.<=
/div><div>Total 7 (delta 4), reused 0 (delta 0)</div><div><br></div><div>
New Changes:</div><div>=A0=A0<a href=3D"http://gerrit.openafs.org/3003">htt=
p://gerrit.openafs.org/3003</a></div><div>=A0=A0<a href=3D"http://gerrit.op=
enafs.org/3004">http://gerrit.openafs.org/3004</a></div><div>=A0=A0<a href=
=3D"http://gerrit.openafs.org/3005">http://gerrit.openafs.org/3005</a></div=
>
<div><br></div><div>To ssh://<a href=3D"http://gerrit.openafs.org/openafs.g=
it">gerrit.openafs.org/openafs.git</a></div><div>=A0* [new branch] =A0 =A0 =
=A0HEAD -&gt; refs/for/master</div></div><div><br></div><div>That should ha=
ve been one simple change, but before creating the topic branch, I think (I=
&#39;m not sure -- I did this a few days ago) I just did &quot;git pull&quo=
t; to update my copy of master. =A0</div>
<div><br></div><div>Was that the wrong way to stay in sync? =A0Am I suppose=
d to be using rebase instead?</div><div><br></div><div>Looking at gerrit, t=
wo of those &quot;changes&quot; are empty, and the most recent one has the =
fs getfid patch I thought I was submitting.</div>
<div><br></div><div>Can someone let me know what I did wrong, so I can avoi=
d the same mistake in the future?</div>

--20cf300fb42df515350492f788d0--