From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Nov 2010 18:39:08 +0000 (-0700)
Subject: Merge branch 'cb/leading-path-removal' into next
X-Git-Tag: ko-next~163
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=55ea322617590995c57c06486884e50915cdfd3b;p=git.git

Merge branch 'cb/leading-path-removal' into next

* cb/leading-path-removal:
  do not overwrite files in leading path
  lstat_cache: optionally return match_len
  add function check_ok_to_remove()
  t7607: add leading-path tests
  t7607: use test-lib functions and check MERGE_HEAD
---

55ea322617590995c57c06486884e50915cdfd3b