[U-Boot] Custodian branch base commits

[Jerry Van Baren]

On 10/30/2012 06:20 PM, Stephen Warren wrote:
> On 10/30/2012 04:06 PM, Wolfgang Denk wrote:
>> Dear Stephen Warren,
>>
>> In message <5090423C.5070605 at wwwdotorg.org> you wrote:
>>>
>>>>>>> git checkout master
>>>>>>> git reset --hard u-boot/master
>> ...
>>>> Why don't you do just
>>>> 	git branch -D master
>>>> 	git checkout -b master u-boot/master
>>>> instead?
>>>
>>> That would work identically. The exact git commands to do this really
>>> aren't the point of this conversation.
>>
>> Maybe not for you.  But I was trying to understand what you are doing,
>> and I find your approach difficult to read.  A "git reset --hard" is
>> nothign I ever do in the normal course of actions.
>>
>>>> BTW - why are you doing this on the "master" branch?  Any other branch
>>>> name appears more appropriate to me for such work?
>>>
>>> Well, the U-Boot wiki tells all custodians to use a branch named master,
>>> and all the custodian repos I've needed to look at follow this convention.
>>
>> You are supposed to _never_ reset or rebase the master branch.
> 
> I assume that statement is conditionalized by "within the U-Boot
> process" and "in the main u-boot.git repository"; it's not necessarily
> required to be true just due to use of git.
> 
> Well, even in recent history, that hasn't been actual practice. The wiki
> even explicitly tells you to rebase:
> 
> http://www.denx.de/wiki/U-Boot/CustodianGitTrees
> 
> Who owns updating that?

It's a wiki, *nobody* owns it. :-O

> I could take a stab, but since I'm pretty new to U-Boot development,
> not a custodian, and pushing for changes, I'm probably not the best
> person to re-write it, and least not without a 
> code-review/patch-based process.

I wrote the advice in 2007, relatively early days in our (u-boot's and
my) git usage.
  <http://www.denx.de/wiki/view/U-Boot/CustodianGitTrees?rev=1.19>
It is definitely worth updating to recommend better techniques.

Best regards,
gvb

[snip]