Code

git-p4: stop ignoring apple filetype
authorPete Wyckoff <pw@padd.com>
Sun, 16 Oct 2011 14:45:49 +0000 (10:45 -0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Oct 2011 03:46:49 +0000 (20:46 -0700)
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>
contrib/fast-import/git-p4

index 0490ca563b377385cafa5e17e52e271894ca5743..6b91595ff6c9e55bb13c3f169511bebb09c3c0b9 100755 (executable)
@@ -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: