[U-Boot] [GIT PULL] Pull request: u-boot-staging

Igor Grinberg
2011-11-24T12:33:45Z

Hi Wolfgang,

On 11/24/11 13:46, Wolfgang Denk wrote:
> Dear Igor Grinberg,
>
> In message <4ECDE8C3.2050508@compulab.co.il> you wrote:
>>
>>> By that logic _all_ commits in the Linux kernel must have the SoB of
>>> Linus Torvalds. Do they?
>>
>> No they should not.
>> As for my understanding, the delivery path ends with the repository
>> from which the pull process starts.
>
> That makes no sense either. What about the case where the author
> provides (say, for convenience) a git repository where we can pull
> from, instead of applying the posting from the ML or PW?

Well, I don't see how this is different from the custodian case,
except that contributor is not a custodian.

>
>> That is, the repository that has the *commit id* first set
>> and then it is not changed, because pull requests keep the
>> history intact. This is the reason, why Linus Torvalds do not
>> sign each patch pulled from others with git pull.
>
> Hm... what's the difference then between pulling from a tree or
> cherry picking from it? What about rebasing a tree?

Cherry picking changes the commit id even if there are no conflicts
and can be done only on one commit at a time.
Pulling does not change the commit id, unless there are conflicts.
Rebasing does not change the history of the rebased branch,
unless there are conflicts and it is discouraged among Linux
maintainers on branches intended for pulling.

>
> Sorry, but all this makes not much sense to me. No matter how you
> handle it, it seems a pretty arbitrary decision to me.

Probably, it is arbitrary.
Let me make it clear, I'm not arguing that one way is better
then another. I just thought that we are following the Linux
model, as there is no document describing, how this thing
should be done.

>
> And in all these cases the code is not touched any more.

I think this is not just about the code, but the patch(es)
(including the commit message and id) as the whole and
the maintainer (custodian) work.

Again, no rule - is kind of rule, but it would be nice to have
a document describing this decision, so less questions will arise.

--
Regards,
Igor.