From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Dec 2016 08:11:42 +0000 (-0800)
Subject: Merge branch 'ld/p4-compare-dir-vs-symlink'
X-Git-Tag: v2.12.0-rc0~102
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=f723df581075ae70252a93ba91dcd017f338236e;p=git.git

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

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

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

f723df581075ae70252a93ba91dcd017f338236e
diff --cc git-p4.py
index 73f5fce4d6,16d0b8a6ee..16e3a18e73
--- a/git-p4.py
+++ b/git-p4.py
@@@ -1607,8 -1582,8 +1615,9 @@@ class P4Submit(Command, P4UserMap)
          filesToDelete = set()
          editedFiles = set()
          pureRenameCopy = set()
+         symlinks = set()
          filesToChangeExecBit = {}
 +        all_files = list()
  
          for line in diff:
              diff = parseDiffTreeEntry(line)