git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* git-p4: problem with commit 97a21ca50ef8
@ 2011-10-31 23:11 Michael Wookey
  2011-11-01  2:08 ` Pete Wyckoff
  0 siblings, 1 reply; 10+ messages in thread
From: Michael Wookey @ 2011-10-31 23:11 UTC (permalink / raw)
  To: Git Mailing List, Pete Wyckoff, Luke Diamand

[ 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

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2011-11-07  4:33 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-31 23:11 git-p4: problem with commit 97a21ca50ef8 Michael Wookey
2011-11-01  2:08 ` Pete Wyckoff
2011-11-01  4:50   ` Michael Wookey
2011-11-02 14:43     ` Vitor Antunes
2011-11-02 22:42       ` Michael Wookey
2011-11-03 11:04         ` Vitor Antunes
2011-11-04 18:39           ` Pete Wyckoff
2011-11-05 17:36             ` [PATCH] git-p4: ignore apple filetype Pete Wyckoff
2011-11-07  2:21               ` Michael Wookey
2011-11-07  4:33                 ` Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).