summaryrefslogtreecommitdiff
path: root/contrib/fast-import/git-p4
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2011-10-16 14:45:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-18 03:46:49 (GMT)
commit97a21ca50ef893a171a50c863fe21a924935fd2a (patch)
treebad0229a84bc3d24d3cefa18d26f841d22f17ccf /contrib/fast-import/git-p4
parent9cffb8c8bfd64d97769b3e3792201bcb3618dd23 (diff)
downloadgit-97a21ca50ef893a171a50c863fe21a924935fd2a.zip
git-97a21ca50ef893a171a50c863fe21a924935fd2a.tar.gz
git-97a21ca50ef893a171a50c863fe21a924935fd2a.tar.bz2
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>
Diffstat (limited to 'contrib/fast-import/git-p4')
-rwxr-xr-xcontrib/fast-import/git-p45
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: