Merge branch 'jc/ls-files-ignored-pathspec'
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:43:54 +0000 (14:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:43:54 +0000 (14:43 -0800)
* jc/ls-files-ignored-pathspec:
  ls-files: fix overeager pathspec optimization
  read_directory(): further split treat_path()
  read_directory_recursive(): refactor handling of a single path into a separate function
  t3001: test ls-files -o ignored/dir

1  2 
dir.c
t/t3001-ls-files-others-exclude.sh

diff --cc dir.c
Simple merge
Simple merge