[Ubuntu Wiki] Update of "Kernel/Dev/HowtoReviewPullRequests" by brad-figg

[Stefan Bader]

On 06/10/2010 09:00 PM, Tim Gardner wrote:
> On 06/09/2010 02:52 PM, Ubuntu Wiki  wrote:
>> Dear Wiki user,
>>
>> You have subscribed to a wiki page or wiki category on "Ubuntu Wiki" for change notification.
>>
>> The following page has been changed by brad-figg:
>> http://wiki.ubuntu.com/Kernel/Dev/HowtoReviewPullRequests?action=diff&rev1=1&rev2=2
>>
>> ------------------------------------------------------------------------------
>>
>>    Pull requests come into the Ubuntu Kernel Team mailing list all the time. This write up is intended to give instruction on how to review the patches from one such pull request.
>>
>> + '''Pull request email:'''
>> + {{{
>> + The following changes since commit 88b50ff9b578518170f285b92542619ee80465ff:
>> +   Stefan Bader (1):
>> +         UBUNTU: Start new release
>>
>> + are available in the git repository at:
>> +
>> +   git://kernel.ubuntu.com/bradf/ubuntu-lucid-wiki lp666xxx
>> +
>> + Brad Figg (1):
>> +       Minor change for wiki example
>> +
>> +  debian.master/NOTES |    5 +----
>> +  1 files changed, 1 insertions(+), 4 deletions(-)
>> + }}}
>> +
>> + '''xxx'''
>>    {{{
>> - cd<path to lucid kernel repo>
>> + git clone git://kernel.ubuntu.com/ubuntu/ubuntu-lucid.git
>> + cd ubuntu-lucid
>>    git fetch
>> - git checkout -b dove-import origin/mvl-dove
>> + git checkout -b review-import origin/master
>> - git fetch git://eric lpxy
>> + git fetch git://kernel.ubuntu.com/bradf/ubuntu-lucid-wiki lp666xxx
>>    git reset --hard FETCH_HEAD
>>    }}}
>>
>>
> 
> When I review a pull request it generally goes something like this:
> 
> git fetch git://kernel.ubuntu.com/bradf/ubuntu-lucid-wiki lp666xxx
> git log -p HEAD..FETCH_HEAD
> 

I hope I did not miss this being actually answered by Nicolas or others and
maybe I am wrong there, but IMO this can be wrong if the HEAD has not moved
ahead with new things since the time the branch of the pull request was done.
While the merge-base is exactly that point where the branch was made from.

> If I like what I see I either cherry-pick the chosen commits, or in 
> simple cases 'git reset --hard FETCH_HEAD', then push.
>

For the same reason I would never do a git reset, because often there are new
things on master that were not there when the person doing the pull request has
done the branch.

I usually do a format-patch and re-apply after checking out the master branch,
but primarily to add sob's and acks or potentially doing some message header
cleanups.

Stefan


> If you're hunting for a merge base, then something is likely wrong. We 
> generally are not dealing with wildly divergent trees.
> 
> rtg