From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Aug 2009 05:15:41 +0000 (-0700)
Subject: Merge branch 'jp/symlink-dirs'
X-Git-Tag: v1.6.5-rc0~84
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6eedee514eb39f2b097cd572b47946cef6ea88e6;p=git.git

Merge branch 'jp/symlink-dirs'

* jp/symlink-dirs:
  t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite
  git-checkout: be careful about untracked symlinks
  lstat_cache: guard against full match of length of 'name' parameter
  Demonstrate bugs when a directory is replaced with a symlink
---

6eedee514eb39f2b097cd572b47946cef6ea88e6