Re: [PATCH 7/9] difftool: teach difftool to handle directory diffs

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 20, 2012, 18:35 UTC
Message-ID: <7vlimv5del.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAFouetiSyTFAR=CJBuYEcpUDq=f2jVaOMnsThgEP-zSbTH1H_g@mail.gmail.com>

Tim Henigan <tim.henigan@gmail.com> writes:

Show 6 quoted lines

> 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.