diff options
author | Kirill Smelkov <kirr@landau.phys.spbu.ru> | 2010-09-29 15:35:23 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 16:53:25 -0700 |
commit | ab3b7b9a6e3bf5793520f06eb76fb03ffe8231cb (patch) | |
tree | 48f0f0d55bf9e813437e5c8f2884742eb8c5380e /sha1_name.c | |
parent | 6517cf7de8fe7a2b2c90655a79d11cba586a36e6 (diff) | |
download | git-ab3b7b9a6e3bf5793520f06eb76fb03ffe8231cb.tar.gz |
blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
git blame --textconv is wrongly calling the textconv filter on
symlinks: symlinks are stored as blobs whose content is the target of
the link, and blame calls the textconv filter on a temporary file
filled-in with the content of this blob.
For example:
$ git blame -C -C regular-file.pdf
Error: May not be a PDF file (continuing anyway)
Error: PDF file is damaged - attempting to reconstruct xref table...
Error: Couldn't find trailer dictionary
Error: Couldn't read xref table
Warning: program returned non-zero exit code #1
fatal: unable to read files to diff
That errors come from pdftotext run on symlink.pdf being extracted to
/tmp/ with one-line plain-text content pointing to link destination.
So several failures are demonstrated here:
- git cat-file --textconv :symlink.bin # also HEAD:symlink.bin
- git blame --textconv symlink.bin
- git blame -C -C --textconv regular-file # but also looks on symlink.bin
At present they all fail with something like.
E: /tmp/j3ELEs_symlink.bin is not "binary" file
NOTE: git diff doesn't try to textconv the pathnames, it runs the
textual diff without textconv, which is the expected behavior.
Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
Reviewed-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
0 files changed, 0 insertions, 0 deletions