From: Junio C Hamano <gitster@pobox.com>
To: Tim Henigan <tim.henigan@gmail.com>
Cc: davvid@gmail.com, git@vger.kernel.org
Subject: Re: [PATCH 7/9] difftool: teach difftool to handle directory diffs
Date: Tue, 20 Mar 2012 11:35:14 -0700 [thread overview]
Message-ID: <7vlimv5del.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CAFouetiSyTFAR=CJBuYEcpUDq=f2jVaOMnsThgEP-zSbTH1H_g@mail.gmail.com> (Tim Henigan's message of "Tue, 20 Mar 2012 13:43:52 -0400")
Tim Henigan <tim.henigan@gmail.com> 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.
next prev parent reply other threads:[~2012-03-20 18:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-17 1:59 [PATCH 7/9] difftool: teach difftool to handle directory diffs Tim Henigan
2012-03-17 3:08 ` David Aguilar
2012-03-17 14:18 ` Tim Henigan
2012-03-17 14:32 ` Jakub Narebski
2012-03-18 0:58 ` Tim Henigan
2012-03-20 17:43 ` Tim Henigan
2012-03-20 18:35 ` Junio C Hamano [this message]
2012-03-20 20:17 ` Tim Henigan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vlimv5del.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=tim.henigan@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).