From: Junio C Hamano Date: Thu, 2 Dec 2010 19:26:24 +0000 (-0800) Subject: Merge branch 'ks/no-textconv-symlink' into maint X-Git-Tag: v1.7.3.3~9 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9f6774ed86a9ac22142c0b37e26e67eb1d032962;p=git.git Merge branch 'ks/no-textconv-symlink' into maint * 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 --- 9f6774ed86a9ac22142c0b37e26e67eb1d032962