git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Victor Engmark <victor.engmark@gmail.com>
To: git@vger.kernel.org
Subject: textconv not used for diff
Date: Wed, 6 Oct 2010 22:36:16 +0200	[thread overview]
Message-ID: <AANLkTi=Y2U1DqnW4oA7_MD3gZMXYzFCFYHwKuuonsmA0@mail.gmail.com> (raw)

Hello,

After trying for a couple hours to get textconv to work according to
<https://git.wiki.kernel.org/index.php/Textconv> and other pages, I've
given up. I've tried changing .odt, .ott and .ods files, but git-diff
never outputs the text diff:

$ git --version
git version 1.7.0.4
$ cat ~/.gitattributes
*.odp diff=odf
*.ods diff=odf
*.odt diff=odf
*.ott diff=odf
$ cat ~/.gitconfig
...
[diff "odf"]
	textconv = odt2txt
$ odt2txt budget.ods
[produces useful output]
$ git diff
diff --git a/budget.ods b/budget.ods
index 64374b9..c4a1949 100644
Binary files a/budget.ods and b/budget.ods differ
$ git diff --textconv
diff --git a/budget.ods b/budget.ods
index 64374b9..e680dee 100644
Binary files a/budget.ods and b/budget.ods differ

Any ideas?

-- 
Victor Engmark

             reply	other threads:[~2010-10-06 20:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-06 20:36 Victor Engmark [this message]
2010-10-06 20:40 ` textconv not used for diff Matthieu Moy
2010-10-06 21:10   ` Victor Engmark

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='AANLkTi=Y2U1DqnW4oA7_MD3gZMXYzFCFYHwKuuonsmA0@mail.gmail.com' \
    --to=victor.engmark@gmail.com \
    --cc=git@vger.kernel.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).