From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Nov 2010 18:39:07 +0000 (-0700)
Subject: Merge branch 'ks/no-textconv-symlink' into next
X-Git-Tag: ko-next~166
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=32f05803374b80b9dc71513784d142e1dc0d7e1e;p=git.git

Merge branch 'ks/no-textconv-symlink' into next

* 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
---

32f05803374b80b9dc71513784d142e1dc0d7e1e