git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kirill Smelkov <kirr@mns.spb.ru>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Axel Bonnet" <axel.bonnet@ensimag.imag.fr>,
	"Clément Poulain" <clement.poulain@ensimag.imag.fr>,
	"Diane Gasselin" <diane.gasselin@ensimag.imag.fr>,
	"Matthieu Moy" <Matthieu.Moy@grenoble-inp.fr>,
	"Jeff King" <peff@peff.net>,
	"Kirill Smelkov" <kirr@landau.phys.spbu.ru>,
	git@vger.kernel.org, "Kirill Smelkov" <kirr@mns.spb.ru>
Subject: [BUG, PATCH v5 0/3] Fix {blame,cat-file} --textconv for cases with symlinks
Date: Wed, 29 Sep 2010 15:35:21 +0400	[thread overview]
Message-ID: <cover.1285758714.git.kirr@mns.spb.ru> (raw)

Recently I've spot a bug in git blame --textconv, which was wrongly
calling pdftotext (my *.pdf conversion program) on a symlink.pdf, and I
was getting something like

    $ 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.


Please apply and thanks,
Kirill


P.S. I'm sorry if this time there is again some bug on my side...


v5:

 o Avoid touching t4042 at all
 o Change $@ to $1 in textconv helper directly in patch1

v4:

 o add prereq on SYMLINKS in tests
 o Use consistent pattern for detecting and converting binaries (was 'bin:' and
   'bin: ')
 o avoid using $@ in textconv helper - it gets only one argument

v3:

 o Slightly changed patches descriptions as per comment by Matthieu, and added
   Matthieu's Reviewed-by.

v2:

 o Incorporated suggestions by Matthieu and Jeff (details in each patch)

Kirill Smelkov (3):
  tests: Prepare --textconv tests for correctly-failing conversion
    program
  blame,cat-file: Demonstrate --textconv is wrongly running converter
    on symlinks
  blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''

 builtin.h                    |    2 +-
 builtin/blame.c              |   33 +++++++++++++++-------
 builtin/cat-file.c           |    2 +-
 sha1_name.c                  |    2 +
 t/t8006-blame-textconv.sh    |   62 +++++++++++++++++++++++++++++++++++++-----
 t/t8007-cat-file-textconv.sh |   38 ++++++++++++++++++++++---
 6 files changed, 114 insertions(+), 25 deletions(-)

-- 
1.7.3.19.g3fe0a

             reply	other threads:[~2010-09-29 11:34 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-29 11:35 Kirill Smelkov [this message]
2010-09-29 11:35 ` [PATCH v5 1/3] blame,cat-file: Prepare --textconv tests for correctly-failing conversion program Kirill Smelkov
2010-09-29 11:35 ` [PATCH v5 2/3] blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks Kirill Smelkov
2010-09-29 11:35 ` [PATCH v5 3/3] blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664'' Kirill Smelkov
2010-10-22 20:05 ` [BUG, PATCH v5 0/3] Fix {blame,cat-file} --textconv for cases with symlinks Jeff King
2010-10-24 17:40   ` Kirill Smelkov

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cover.1285758714.git.kirr@mns.spb.ru \
    --to=kirr@mns.spb.ru \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=axel.bonnet@ensimag.imag.fr \
    --cc=clement.poulain@ensimag.imag.fr \
    --cc=diane.gasselin@ensimag.imag.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=kirr@landau.phys.spbu.ru \
    --cc=peff@peff.net \
    /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.
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 NNTP newsgroup(s).