textconv not used for diff

textconv not used for diff

[Victor Engmark]

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

Re: textconv not used for diff

[Matthieu Moy]

Victor Engmark <victor.engmark@gmail.com> writes:

> 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

.gitattributes file should be in the working tree, not in your $HOME.

The development version of Git has a core.attributesfile variable that
would allow you to have a user-wide ~/.gitattributes, but this isn't
released yet.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

Re: textconv not used for diff

[Victor Engmark]

On Wed, Oct 6, 2010 at 10:40 PM, Matthieu Moy
<Matthieu.Moy@grenoble-inp.fr> wrote:
> Victor Engmark <victor.engmark@gmail.com> writes:
>> 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
>
> .gitattributes file should be in the working tree, not in your $HOME.
>
> The development version of Git has a core.attributesfile variable that
> would allow you to have a user-wide ~/.gitattributes, but this isn't
> released yet.

Thank you very much! To the point and with bonus info for later. Works a charm.

-- 
Victor Engmark