From mboxrd@z Thu Jan  1 00:00:00 1970
From: Junio C Hamano <gitster@pobox.com>
Subject: Re: Built-in checkout: wrong behaviour in subdirectories
Date: Wed, 20 Feb 2008 15:42:52 -0800
Message-ID: <7vd4qr2o03.fsf@gitster.siamese.dyndns.org>
References: <20080220223520.GA23642@localhost>
 <alpine.LNX.1.00.0802201740050.19024@iabervon.org>
 <7vhcg32p0i.fsf@gitster.siamese.dyndns.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: Clemens Buchacher <drizzd@aon.at>, git@vger.kernel.org
To: Daniel Barkalow <barkalow@iabervon.org>
X-From: git-owner@vger.kernel.org Thu Feb 21 00:43:59 2008
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1JRybV-0004hd-K5
	for gcvg-git-2@gmane.org; Thu, 21 Feb 2008 00:43:58 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756120AbYBTXnX (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Wed, 20 Feb 2008 18:43:23 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754469AbYBTXnX
	(ORCPT <rfc822;git-outgoing>); Wed, 20 Feb 2008 18:43:23 -0500
Received: from a-sasl-quonix.sasl.smtp.pobox.com ([208.72.237.25]:57981 "EHLO
	sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753814AbYBTXnW (ORCPT <rfc822;git@vger.kernel.org>);
	Wed, 20 Feb 2008 18:43:22 -0500
Received: from .pobox.com (localhost [127.0.0.1])
	by a-sasl-quonix.pobox.com (Postfix) with ESMTP id 002962ECA;
	Wed, 20 Feb 2008 18:43:20 -0500 (EST)
Received: from pobox.com (ip68-225-240-77.oc.oc.cox.net [68.225.240.77])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client
 certificate requested) by a-sasl-quonix.pobox.com (Postfix) with ESMTP id
 2FE5A2E96; Wed, 20 Feb 2008 18:43:14 -0500 (EST)
In-Reply-To: <7vhcg32p0i.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's
 message of "Wed, 20 Feb 2008 15:21:01 -0800")
User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux)
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/74571>

Junio C Hamano <gitster@pobox.com> writes:

> Daniel Barkalow <barkalow@iabervon.org> writes:
>
>> Junio: it looks like something used to cause read-tree to be run with 
>> pwd being the working tree root in git-checkout.sh.
>
> "Something"?  I think we explicitly cdup when switching
> branches, and we should do the same in C rewrite.
>
>         # We are switching branches and checking out trees, so
>         # we *NEED* to be at the toplevel.
>         cd_to_toplevel

Isn't it just the matter of not passing prefix to topts in
merge_working_tree()?  Your other calls to unpack_trees() do not
seem to pass bogus prefix to it.

IIRC, the "prefix" to unpack_trees() is not about the path
limiter, but grafting a tree into a place where it originally
was not intended to be (i.e. to support "read-tree --prefix").