Merge branch 'nd/checkout-paths-reduce-match-pathspec-calls'
commit97fefaf6d32d3e8dbb78778f62fcdd980dcf46c7
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 16:34:00 +0000 (3 09:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 16:34:00 +0000 (3 09:34 -0700)
tree410a80ba3143ff806a0bfbba469b42a5950a0e18
parent961c5129d53554d4d71003899fab8dda846d7c2a
parente721c1544f9166e8f08a7f8c0e6178ea3a45e255
Merge branch 'nd/checkout-paths-reduce-match-pathspec-calls'

Consolidate repeated pathspec matches on the same paths, while
fixing a bug in "git checkout dir/" code started from an unmerged
index.

* nd/checkout-paths-reduce-match-pathspec-calls:
  checkout: avoid unnecessary match_pathspec calls
cache.h