[U-Boot] Pull request for u-boot-marvell.git

[Albert ARIBAUD]

Hi Prafulla,

Le 19/10/2011 06:01, Prafulla Wadaskar a écrit :
>
>
>> -----Original Message-----
>> From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
>> Sent: Tuesday, October 18, 2011 11:26 PM
>> To: Prafulla Wadaskar
>> Cc: u-boot at lists.denx.de; wd at denx.de; Ashish Karkare; Prabhanjan Sarnaik
>> Subject: Re: Pull request for u-boot-marvell.git
>>
>> Hi Prafulla,
>>
>> Le 18/10/2011 13:12, Prafulla Wadaskar a écrit :
>>> Hi Albert
>>>
>>> Please kindly pull
>>> The following changes since commit
>> 0e005ee09d3424e2780efc6895fcbfbdf7a492fa:
>>>     Prafulla Wadaskar (1):
>>>           Merge branch 'master' of
>> git://git.marvell.com/mirror/denx.de/u-boot-arm into armmaster
>>
>> This commit is not present in u-boot-arm... It is the result of a merge
>> of u-boot-arm/master into u-boot-marvell/master. This is not the way a
>> pull request should be prepared according to the U-Boot Wiki.
>>
>> I would much prefer you to fetch u-boot-arm/master, then rebase your
>> master branch onto it, then request a pull relative to
>> u-boot-arm/master, i.e. use the following commands (assuming your git
>> setup has a remote called u-boot-arm)
>>
>> 	git fetch u-boot-arm
>> 	git checkout master
>> 	git rebase u-boot-arm/master
>> 	git push ...
>> 	git request-pull
>
> Hi Albert
>
> I followed similar process(instead of git fetch I am using git pull, and I am not sure git push and git pull-request are interchanged).
> I will check and let you know.

The issue is with the git pull command, because a git pull amounts to a 
git fetch followed by a git merge -- that's what causes the commit you 
base your pull request on.

Yes, I know 'git pull' is the command given in the Wiki, but the way the 
instructions are laid out in the Wiki, this pull is done in an ad hoc 
branch and will not cause a merge to your master.

I *definitely* will go and rewrite the Wiki on this, both to make 
explanations simpler and less error-prone, and to account for the 
layered u-boot / u-boot-arm / u-boot-{ti,marvell,imx,samsung,atmel} 
repository workflow.

As for git push and git request-pull, if you request before push you'll 
see that the request has an error message about not being able to locate 
the branch; the order must be push, then request pull (which is logical: 
before I can pull your branch, it must be made available).

> I will regenerate a new pull request.

Thanks a lot!

> Regards..
> Prafulla . .

Amicalement,
-- 
Albert.