Merge branch 'cb/maint-ls-files-error-report' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Sep 2011 21:30:49 +0000 (14:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Sep 2011 21:30:49 +0000 (14:30 -0700)
commita0b1cb60ab296476084b3d4766a943e2d62719b8
tree76ae24f6eb6c2c7488e0c9ae7851ae378d614c3d
parent85b3c75f4fd3aa4da976bac702827dc8d7d1bf15
parent385ceec1cb46f8a476fa11ffc853dedba512fd52
Merge branch 'cb/maint-ls-files-error-report' into maint

* cb/maint-ls-files-error-report:
  t3005: do not assume a particular order of stdout and stderr of git-ls-files
  ls-files: fix pathspec display on error
builtin/checkout.c
cache.h