This patch adds support of textconv to git-gui blame. It is based on our previous work which adds textconv support to blame: http://mid.gmane.org/1275921713-3277-1-git-send-email-axel.bonnet@xxxxxxxxxxxxxxx It also uses a git-gui patch done by Clemens Buchacher which adds textconv support to git-gui diff: 20100415193944.GA5848@localhost">http://mid.gmane.org/20100415193944.GA5848@localhost. git-gui blame is based on cat-file to get the content of the file in different revisions, so the patch adds textconv support to cat-file. The first part of this patch adds get_sha1_with_context() in order to know the pathname of the concerned blob, as textconv needs it to work. This third version corrects one bug and some compilation warnings Clément Poulain (4): sha1_name: add get_sha1_with_context() textconv: support for cat_file git gui: use textconv filter for diff and blame t/t8007: test textconv support for cat-file builtin.h | 2 + builtin/blame.c | 8 ++-- builtin/cat-file.c | 33 ++++++++++++++++++-- cache.h | 11 ++++++ git-gui/git-gui.sh | 28 ++++++++++++++++- git-gui/lib/blame.tcl | 21 +++++++++++- git-gui/lib/diff.tcl | 5 ++- git-gui/lib/option.tcl | 1 + sha1_name.c | 31 +++++++++++++++--- t/t8007-cat-file-textconv.sh | 70 ++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 194 insertions(+), 16 deletions(-) create mode 100755 t/t8007-cat-file-textconv.sh -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html