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>maint
							parent
							
								
									9cffb8c8bf
								
							
						
					
					
						commit
						97a21ca50e
					
				|  | @ -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: | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Pete Wyckoff
						Pete Wyckoff