From: Roland Kaufmann <rlndkfmn+git@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Display change history as a diff between two dirs
Date: Tue, 1 Nov 2011 10:01:33 +0100 [thread overview]
Message-ID: <CANEMaQRoXRygmrYsu0xF6mWq50r9Qhh-YuXXNAhyQewd+fDtsQ@mail.gmail.com> (raw)
In-Reply-To: <7v39e8o61s.fsf@alter.siamese.dyndns.org>
On Tue, Nov 1, 2011 at 04:49, Junio C Hamano <gitster@pobox.com> wrote:
> Roland Kaufmann <rlndkfmn+git@gmail.com> writes:
>> Would it be better to have yet another configuration available for
>> this option instead of reusing the existing infrastructure for `git
>> difftool`?
> It probably is OK for "git diff --dirdiff" to use GIT_EXTERNAL_TREEDIFF if
> and only if GIT_EXTERNAL_DIFF is not defined, and use GIT_EXTERNAL_DIFF
> otherwise. People who have GIT_EXTERNAL_DIFF set to a tool capable of
> handing directory pair can just add "--dirdiff" to the command line, and
Did you perhaps mean the other way around: GIT_EXTERNAL_TREEDIFF
if set, and GIT_EXTERNAL_DIFF otherwise?
I will revise the patch to incorporate that, and at the same time fix
the isempty
function (it can be done simpler).
>>> It also is not clear what could be used in "$@". Obviously you would
>>> not want things like "-U20" and "--stat" fed to the first "list of
>>> paths" phase, but there may be some options you may want to give to
>>> the inner "external diff" thing.
>> Ideally, it should work the same way as `git difftool`.
> I am not so sure about that; difftool is another way to drive a tool one
> filepair at a time. You want to drive a tool that takes them as two _sets_
> of files, one in each directory.
I was thinking about the behaviour when you send options that are not
applicable to files at all, such as "--stat". In that case, it just stops after
`git diff`. Options that only applies to one file and not to a set
have I admittedly
not thought about (yet).
--
Roland.
next prev parent reply other threads:[~2011-11-01 9:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-29 20:51 [PATCH] Display change history as a diff between two dirs Roland Kaufmann
2011-10-30 6:09 ` Junio C Hamano
2011-10-31 9:21 ` Roland Kaufmann
2011-11-01 3:49 ` Junio C Hamano
2011-11-01 9:01 ` Roland Kaufmann [this message]
2011-11-01 17:15 ` Junio C Hamano
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=CANEMaQRoXRygmrYsu0xF6mWq50r9Qhh-YuXXNAhyQewd+fDtsQ@mail.gmail.com \
--to=rlndkfmn+git@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).