git-p4: problem with commit 97a21ca50ef8

[ please CC me as I am not subscribed to the list ]

Hi,

Commit 97a21ca50ef893a171a50c863fe21a924935fd2a "git-p4: stop ignoring apple filetype" isn't correct. Without knowing too much about how git-p4 works, it appears that the "apple" filetype includes the resource fork, and the "p4 print" that is used to obtain the content from the perforce server doesn't take this into account, or maybe some post processing of the file needs to be done to include the data, but not the resource fork, before inclusion into the git repo.

With the above commit, a binary blob that literally contains the resource fork and data is included within the git repo. Of course, without the above commit, the intended file was never included in the git repo at all. Perhaps the resource fork issue was a known problem by the original git-p4 author.

A sample file that that demonstrates what the above commit produces is here (use curl/wget):

  http://dl.dropbox.com/u/1006983/sample_image_fail.png

This is literally a binary blob with about 110 KiB of resource fork plus the PNG data. The same image, minus about 110 KiB of resource fork is here:

  http://dl.dropbox.com/u/1006983/sample_image_correct.png

I'm happy to test patches as we have a perforce repository with files of the "apple" filetype.

Thanks