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

diff --cc git-p4.py
index 73f5fce,16d0b8a..16e3a18
--- 1/git-p4.py
--- 2/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)