[Insight-developers] git/gerrit issue (many garbage merge patches showing up in gerrit)

[Brad King]

On 06/03/2011 09:05 AM, Tom Vercauteren wrote:
> I approximatively followed the instructions here
>  http://www.itk.org/Wiki/ITK/Gerrit/Primer

Those instructions are old.  Where did you see a link to them?
The entry point to the current instructions is here:

  http://www.itk.org/Wiki/ITK/Git

Following the "Develop ITK" link leads here:

  http://www.itk.org/Wiki/ITK/Git/Develop

> but it ended up with a lot of garbage gerrit entries:
>  http://review.source.kitware.com/
> e.g.
>  http://review.source.kitware.com/#change,1782
>
> I have absolutely no clue what I did wrong or how to fix it...

You probably didn't do anything wrong while following the old instructions.
One can see what happened by fetching the original version of the change:

  git fetch http://review.source.kitware.com/p/ITK refs/changes/19/1819/1

and viewing it with

  gitk origin/master..ea3aa1ec

or the command shown at the bottom of this message.  It looks like you
cloned last summer and committed a change to your local "master" on
August 30 with subject

  "BUG: Allow ExtrapolateImageFunction to work on vector images"

Then you occasionally ran "git pull" to update your ITK from upstream.
Each time it actually merged the upstream master into your local master.
Later you created another local commit on October 7 with subject

  "BUG: Runtime warning in TransformMeshFilter"

and then continued to pull over time.  Finally, when you followed the
old "primer" instructions you started the topic from your local master.
Effectively your topic contained all your local commits and merges in
addition to the intended change.

The modern instructions I link above suggest starting topics from
origin/master to avoid any issue like this.  They also suggest using
the "git prepush" alias to manually verify the change you are about to
push.  If extra changes had crept in somehow then you might have noticed
at that point.

In order to correct the situation I abandoned all the extra changes in
Gerrit.  Then I recreated your topic with the single intended commit as
if you had started it from origin/master and pushed a new patch set to
the change.  Now review can proceed as normal.  You can pick up on the
instructions here:

  http://www.itk.org/Wiki/ITK/Git/Develop#Revise_a_Topic

after reviews.

-Brad


$ git log --oneline origin/master..ea3aa1ec
ea3aa1e BUG: TestImportImageContainer could crash on reallocation #12239
0b3fd2c Merge branch 'master' of git://itk.org/ITK
1fce3c1 Merge branch 'master' of git://itk.org/ITK
c7b393e Merge branch 'master' of git://itk.org/ITK
d4e2e1f Merge branch 'master' of git://itk.org/ITK
6cbbce1 Merge branch 'master' of git://itk.org/ITK
e484268 Merge branch 'master' of git://itk.org/ITK
7242a94 Merge branch 'master' of git://itk.org/ITK
7b618a1 Merge branch 'master' of git://itk.org/ITK
aeb73a3 Merge branch 'master' of git://itk.org/ITK
cd81562 Merge branch 'master' of git://itk.org/ITK
10ea9b0 Merge branch 'master' of git://itk.org/ITK
16462be Merge branch 'master' of git://itk.org/ITK
92dad4a Merge branch 'master' of git://itk.org/ITK
838f781 Merge branch 'master' of git://itk.org/ITK
605bb84 Merge branch 'master' of git://itk.org/ITK
410e272 Merge branch 'master' of git://itk.org/ITK
b0b55fd Merge branch 'master' of git://itk.org/ITK
ef1184a Merge branch 'master' of git://itk.org/ITK
70fb6b7 Merge branch 'master' of git://itk.org/ITK
1f46a0a Merge branch 'master' of git://itk.org/ITK
b5fbe08 Merge branch 'master' of git://itk.org/ITK
f4e75c5 Merge branch 'master' of git://itk.org/ITK
69d28e7 Merge branch 'master' of git://itk.org/ITK
029e5f0 Merge branch 'master' of git://itk.org/ITK
0f2977b Merge branch 'master' of git://itk.org/ITK
4f758d7 Merge branch 'master' of git://itk.org/ITK
cceb9cd BUG: Runtime warning in TransformMeshFilter
7509c50 Merge branch 'master' of git://itk.org/ITK
39b6778 Merge branch 'master' of git://itk.org/ITK
daf157d Merge branch 'master' of git://itk.org/ITK
79839aa Merge branch 'master' of git://itk.org/ITK
9c0392c Merge branch 'master' of git://itk.org/ITK
04bbb06 Merge branch 'master' of git://itk.org/ITK
4f48205 Merge branch 'master' of git://itk.org/ITK
1da3f01 Merge branch 'master' of git://itk.org/ITK
d0ca86c Merge branch 'master' of git://itk.org/ITK
1fc578b Merge branch 'master' of git://itk.org/ITK
b0c2b3e BUG: Allow ExtrapolateImageFunction to work on vector images