Re: [git pull] ieee1394 tree for 2.6.18

From: Linus Torvalds
Date: Tue Jun 20 2006 - 17:26:01 EST




On Tue, 20 Jun 2006, Russell King wrote:
>
> Given that you've complained about me sending daily pull requests
> already, how do you intend folk to handle the situation where they've
> sent you a pull request, it's apparantly been ignored

It's not ignored, btw, I'm staggering the merging so that I don't merge
everything the first day - I want nightly snapshots to have a chance of
making a difference to people who aren't git users but test patches.

(In other words, I want "2.6.17-git1" and "2.6.17-git2" etc to actually
b esomewhat spread out - rather than merge everything when people send it
to me the first day after a release. I also tend to want a release to be
"left alone" for a day or so, so that even people who track the
development tree religiously will actually end up testing it).

> Given your complaint and your comments above, I can only assume that
> I must not touch a tree which I've asked you to pull for 48 hours
> just in case you do decide to honour the pull request.

Actually, from a technical standpoint, the easy way to do this with git is
to simply have different branches (or even tags).

That said, people who I merge up with often (and you're one of them), and
I don't actually tend to have any issues with (and again, you're one of
them), I don't mind it I pull and notice that there's been an added commit
or two since you asked me to pull.

Again - the "please pull" message is because I want to work with the
_person_, and I want to be comfortable that what I pull is what they
intended to pull.

And as you can guess, trees that I constantly update from end up having
much less of that issue - there's less risk of there being
miscommunication or just plain mistakes in those kinds of setups _anyway_.

So in many ways, if it's an archive that doesn't sync up very often, I
want such people to be _extra_ careful. When I get a pull request for
ieee1394, _especially_ as the maintainer kind of seems to keep on
changing, I want to be a lot more careful than with something like yours
or Davids trees, that I've worked with for years beforehand, and have
already been using git pretty much since day one etc etc.

In other words: rules are rules, and in the end, they matter a hell of a
lot less than just common sense. But they matter _more_ for the repo
maintainers I haven't gotten used to.

Linus
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/