From: Pete Wyckoff <pw@padd.com>
Date: Sun, 16 Oct 2011 14:45:49 +0000 (-0400)
Subject: git-p4: stop ignoring apple filetype
X-Git-Tag: v1.7.8-rc0~25^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=97a21ca50ef893a171a50c863fe21a924935fd2a;p=git-core%2Fgit.git

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

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 0490ca563..6b91595ff 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1247,11 +1247,6 @@ class P4Sync(Command, P4UserMap):
     # - helper for streamP4Files
 
     def streamOneP4File(self, file, contents):
-        if file["type"] == "apple":
-            print "\nfile %s is a strange apple file that forks. Ignoring" % \
-                file['depotFile']
-            return
-
         relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)
         relPath = self.wildcard_decode(relPath)
         if verbose: