From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH 7/9] difftool: teach difftool to handle directory diffs Date: Tue, 20 Mar 2012 11:35:14 -0700 Message-ID: <7vlimv5del.fsf@alter.siamese.dyndns.org> References: <1331949574-15192-1-git-send-email-tim.henigan@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: davvid@gmail.com, git@vger.kernel.org To: Tim Henigan X-From: git-owner@vger.kernel.org Tue Mar 20 19:35:25 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SA3tz-0001mS-JC for gcvg-git-2@plane.gmane.org; Tue, 20 Mar 2012 19:35:23 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755405Ab2CTSfT (ORCPT ); Tue, 20 Mar 2012 14:35:19 -0400 Received: from b-pb-sasl-quonix.pobox.com ([208.72.237.35]:52492 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755192Ab2CTSfR (ORCPT ); Tue, 20 Mar 2012 14:35:17 -0400 Received: from smtp.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id CA2936DE6; Tue, 20 Mar 2012 14:35:16 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=QbPoZIRviujsgpUxUZhtAPl3xjs=; b=OhH8eh CJVI9zcwLCHLhurTzNCIU+GbQy3eSIJM6W4XBlb+QF/ZjTygLL+D1UPgDCc8jT92 BsIV0mIy5oT4PO1Dg56mGrDdfKQZItXWksWc36UcQPtxB5B+DfZZt7kKaTDFGaky Xd0GeeVu53/2Slm1x10BEcZ2FFOaj6hZciWmA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=I1utNYAC69bR/DHE2YY+0oD4ehwhE5/D HZKJ3bii1w7qrAoDGCzM5WgbUKtSSONhMErwN2HMKALSgzxVSxrIoANMe4aV5sCB NBo6tSjO/pUGwjYrozOgLncVMAB+SRL1FXkmwO1+J7kX1acedh0NYRZpZkd7luRO +2k+ZoV/IK4= Received: from b-pb-sasl-quonix.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id C15C96DDF; Tue, 20 Mar 2012 14:35:16 -0400 (EDT) Received: from pobox.com (unknown [76.102.170.102]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by b-sasl-quonix.pobox.com (Postfix) with ESMTPSA id 5355F6DDC; Tue, 20 Mar 2012 14:35:16 -0400 (EDT) In-Reply-To: (Tim Henigan's message of "Tue, 20 Mar 2012 13:43:52 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-Pobox-Relay-ID: 702181A4-72BB-11E1-A876-9DB42E706CDE-77302942!b-pb-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Tim Henigan writes: > However, when 'difftool --dir-diff' is run from a subdirectory of the > Git repository, there are problems. > - The temporary index file generated by 'git update-index' appears > to be correct. > - 'git checkout-index --all --prefix=$tmp' command does not work > (output tmp dir is empty). Hrmph. $ rm -fr /tmp/xyz $ cd Documentation $ git checkout-index --all --prefix=/tmp/xyz/ $ ls -F /tmp/xyz Documentation/ $ rm -fr /tmp/xyz $ GIT_DIR=$(pwd)/../.git GIT_WORK_TREE=$(pwd) \ git checkout-index --all --prefix=/tmp/xyz/ $ ls -FC /tmp/xyz | head -2 abspath.c git-merge-octopus.sh* reflog-walk.c aclocal.m4 git-merge-one-file.sh* reflog-walk.h Be sure to have the trailing slash in $tmp.