From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Nov 2010 22:59:27 +0000 (-0800)
Subject: Merge branch 'ks/no-textconv-symlink'
X-Git-Tag: v1.7.4-rc0~144
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dd9d290bc983255a24c70e26e7fad40c6212b636;p=git.git

Merge branch 'ks/no-textconv-symlink'

* ks/no-textconv-symlink:
  blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
  blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
  blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
---

dd9d290bc983255a24c70e26e7fad40c6212b636