by smtp.nexlab.net (Postfix) with ESMTP id 1D584FB7C for <[email protected]>; Tue, 24 May 2005 10:01:50 +0200 (CEST)
Received: ([email protected]) by vger.kernel.org via listexpand
id S261302AbVEXGrF (ORCPT <rfc822;[email protected]>); Tue, 24 May 2005 02:47:05 -0400
Received: ([email protected]) by vger.kernel.org id S261362AbVEXGrF
(ORCPT <rfc822;linux-kernel-outgoing>); Tue, 24 May 2005 02:47:05 -0400
Received: from fire.osdl.org ([65.172.181.4]:42880 "EHLO smtp.osdl.org")
by vger.kernel.org with ESMTP id S261302AbVEXGqf (ORCPT <rfc822;[email protected]>); Tue, 24 May 2005 02:46:35 -0400
Received: from shell0.pdx.osdl.net (fw.osdl.org [65.172.181.6])
by smtp.osdl.org (8.12.8/8.12.8) with ESMTP id j4O6kTjA025713 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Mon, 23 May 2005 23:46:29 -0700
Received: from localhost (shell0.pdx.osdl.net [10.9.0.31])
by shell0.pdx.osdl.net (8.13.1/8.11.6) with ESMTP id j4O6kScg012582; Mon, 23 May 2005 23:46:28 -0700
Date: Mon, 23 May 2005 23:48:33 -0700 (PDT)
From: Linus Torvalds <[email protected]>
To: Jeff Garzik <[email protected]>
Cc: Andrew Morton <[email protected]>, Netdev <[email protected]>,
Linux Kernel <[email protected]>
Subject: Re: [git patches] 2.6.x net driver updates
In-Reply-To: <[email protected]>
Message-ID: <[email protected]>
References: <[email protected]> <[email protected]>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-Spam-Status: No, hits=0 required=5 tests=
X-Spam-Checker-Version: SpamAssassin 2.63-osdl_revision__1.40__
X-MIMEDefang-Filter: osdl$Revision: 1.109 $
X-Scanned-By: MIMEDefang 2.36
Sender: [email protected]
Precedence: bulk
X-Mailing-List: [email protected]
Quoted 4 lines · Jeff Garzik
You are getting precisely the same thing you got under BitKeeper: pull from X, you get my tree, which was composed from $N repositories. The tree you pull was created by my running 'bk pull' locally $N times.
No. Under BK, you had DIFFERENT TREES.
What does that mean? They had DIFFERENT NAMES.
Which meant that the commit message was MEANINGFUL.
Quoted 4 lines
Ultimately, you appear to be complaining about:
* your own git-pull-script, which doesn't record the $2 (branch) argument in the commit message.
Yes, because _my_ pull script is meant to work with the way _I_ have told people (including you) they should work.
The fact that you mush everything up in one tree _despite_ me having told you that isn't a good thing to do is the problem.
Git can technically do it, but then you shouldn't use my scripts, which aren't written for that behaviour.
Quoted 1 line
Hey, I didn't write git-pull-script, I just use it :)
You don't use it, you MIS-use it. Which is what I'm complaining about.
Quoted 2 lines
Switching heads around? It sounds like you did not pull from the branch I mentioned.
No, I pulled exactly from the head you mentioned.
In fact, go look at YOUR OWN changelog. And then compare that changelog to the changelog you had when you used BK, and realize that IT IS NOT AT ALL EQUIVALENT. You used to have valid changelogs, even for the merge heads. You don't any more:
Automatic merge of /spare/repo/netdev-2.6/.git Automatic merge of /spare/repo/netdev-2.6/.git Automatic merge of /spare/repo/netdev-2.6/.git Automatic merge of /spare/repo/netdev-2.6/.git Merge of /spare/repo/netdev-2.6/.git
See a pattern?
Your BK usage was equivalent to having multiple GIT repositories.
Linus
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/