From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Jan 2017 23:11:07 +0000 (-0800)
Subject: Merge branch 'ld/p4-compare-dir-vs-symlink' into maint
X-Git-Tag: v2.11.1~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa83f7a2a4a677e9eca4a599f47e027ad06716d1;p=thirdparty%2Fgit.git

Merge branch 'ld/p4-compare-dir-vs-symlink' into maint

"git p4" misbehaved when swapping a directory and a symbolic link.

* ld/p4-compare-dir-vs-symlink:
  git-p4: avoid crash adding symlinked directory
---

aa83f7a2a4a677e9eca4a599f47e027ad06716d1