git-p4: stop ignoring apple filetype
Currently "apple" filetype is ignored explicitly, and the file is not even included in the git repository. This seems wrong. Remove this, letting it be treated like a "binary" filetype. Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Pete Wyckoff committed
Oct 16, 2011 at 10:45 UTC
97a21ca50ef893a171a50c863fe21a924935fd2a
1 file changed
-5
contrib/fast-import/git-p4
-5
@@ -1247,11 +1247,6 @@ class P4Sync(Command, P4UserMap):
1247
# - helper for streamP4Files
1248
1249
def streamOneP4File(self, file, contents):
1250
- if file["type"] == "apple":
1251
- print "\nfile %s is a strange apple file that forks. Ignoring" % \
1252
- file['depotFile']
1253
- return
1254
-
1250
relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)
1251
relPath = self.wildcard_decode(relPath)
1252
if verbose: