From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Aug 2009 19:05:57 +0000 (-0700)
Subject: Merge branch 'jp/symlink-dirs' into maint
X-Git-Tag: v1.6.4.2~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6dfa21309f4b1eeede72a942df1155327717fb87;p=git.git

Merge branch 'jp/symlink-dirs' into maint

* 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
---

6dfa21309f4b1eeede72a942df1155327717fb87