Merge branch 'ks/no-textconv-symlink' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 19:26:24 +0000 (2 11:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 19:26:24 +0000 (2 11:26 -0800)
* 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

1  2 
builtin.h
builtin/blame.c
sha1_name.c

diff --cc builtin.h
Simple merge
diff --cc builtin/blame.c
Simple merge
diff --cc sha1_name.c
Simple merge