From: Jeff King <peff@peff.net>
To: Stas Bekman <stas@stason.org>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: git diff-tree ignores --textconv
Date: Sun, 23 Sep 2018 20:43:07 -0400 [thread overview]
Message-ID: <20180924004307.GA26103@sigill.intra.peff.net> (raw)
In-Reply-To: <41cd358c-d900-2996-b78a-b9d897a2ba2b@stason.org>
On Sun, Sep 23, 2018 at 03:41:45PM -0700, Stas Bekman wrote:
> $ git config --get diff.jupyternotebook.command
> git-nbdiffdriver diff
That's an "external diff driver", not a textconv driver.
So here:
> $ GIT_TRACE=1 git diff-tree -p HEAD --textconv test/test.ipynb
> <shows normal diff, ignoring nbdiff>
You probably want "--ext-diff", not "--textconv".
There's some discussion in the gitattributes manpage, but the short of
it is that textconv converts binary input to text, which is then fed
through the normal diff mechanism. Whereas an external diff driver is
given both sides and can produce whatever output it wants. Textconv is
less flexible, but generally way easier to write.
-Peff
next prev parent reply other threads:[~2018-09-24 0:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-23 22:41 git diff-tree ignores --textconv Stas Bekman
2018-09-24 0:43 ` Jeff King [this message]
2018-09-24 0:56 ` Stas Bekman
2018-09-24 1:23 ` Jeff King
2018-09-24 1:37 ` Stas Bekman
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180924004307.GA26103@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=stas@stason.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).