From: Pete Wyckoff Date: Sun, 16 Oct 2011 14:45:49 GMT Subject: [PATCH 4/6] git-p4: stop ignoring apple filetype Message-ID: <20111016144549.GG22144@arf.padd.com> In-Reply-To: <20111016144215.GC22144@arf.padd.com> 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 Signed-off-by: Pete Wyckoff --- contrib/fast-import/git-p4 | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 0490ca5..6b91595 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: -- 1.7.7