Merge branch 'jk/fix-ls-files-other'
commitd67dd17b336a1f39760324b6cc05eaee17b5f124
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Oct 2008 00:57:56 +0000 (21 17:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Oct 2008 00:57:56 +0000 (21 17:57 -0700)
tree2b3353aa25ac10ef9865b59025adf9e1f7e8b9f5
parent500ac7f42e7f2ae42e33be3bbb7120b788175b1d
parente845e16ee6de99a203db47eeb840daf3b1914ec9
Merge branch 'jk/fix-ls-files-other'

* jk/fix-ls-files-other:
  refactor handling of "other" files in ls-files and status
read-cache.c