Skip to content

Commit 97a21ca

Browse files
Pete Wyckoffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Pete Wyckoff <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9cffb8c commit 97a21ca

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

contrib/fast-import/git-p4

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,11 +1247,6 @@ class P4Sync(Command, P4UserMap):
12471247
# - helper for streamP4Files
12481248

12491249
def streamOneP4File(self, file, contents):
1250-
if file["type"] == "apple":
1251-
print "\nfile %s is a strange apple file that forks. Ignoring" % \
1252-
file['depotFile']
1253-
return
1254-
12551250
relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)
12561251
relPath = self.wildcard_decode(relPath)
12571252
if verbose:

0 commit comments

Comments
 (0)