diff options
| author | Simon Ruderich <simon@ruderich.org> | 2013-04-05 15:16:30 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-05 10:30:44 -0700 |
| commit | a8f6109428b868611c0a59e6894e2b6b38c34e1b (patch) | |
| tree | 92266b799433bab33552abb6e621c2a883ddfb6a /t/t4300-merge-tree.sh | |
| parent | 7cdb9b42c359000b1d3d604f847598afd015b7c7 (diff) | |
| download | git-a8f6109428b868611c0a59e6894e2b6b38c34e1b.tar.gz | |
diffcore-pickaxe: respect --no-textconv
git log -S doesn't respect --no-textconv:
$ echo '*.txt diff=wrong' > .gitattributes
$ git -c diff.wrong.textconv='xxx' log --no-textconv -Sfoo
error: cannot run xxx: No such file or directory
fatal: unable to read files to diff
Reported-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Signed-off-by: Simon Ruderich <simon@ruderich.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4300-merge-tree.sh')
0 files changed, 0 insertions, 0 deletions