Skip to content

Commit

Permalink
git-p4: stop ignoring apple filetype
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pete Wyckoff authored and Junio C Hamano committed Oct 18, 2011
1 parent 9cffb8c commit 97a21ca
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions contrib/fast-import/git-p4
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 97a21ca

Please sign in to comment.