From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Nov 2011 05:21:57 +0000 (-0800)
Subject: Merge branch 'pw/p4-appledouble-fix'
X-Git-Tag: v1.7.8-rc1~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=de263479506066f240cf629aa3aac50c94668d89;p=git.git

Merge branch 'pw/p4-appledouble-fix'

* pw/p4-appledouble-fix:
  git-p4: ignore apple filetype
---

de263479506066f240cf629aa3aac50c94668d89
diff --cc contrib/fast-import/git-p4
index f885d707c,da1db4a8c..b975d67fc
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@@ -1315,9 -1269,22 +1315,22 @@@ class P4Sync(Command, P4UserMap)
              # operations.  utf16 is converted to ascii or utf8, perhaps.
              # But ascii text saved as -t utf16 is completely mangled.
              # Invoke print -o to get the real contents.
 -            text = p4_read_pipe('print -q -o - "%s"' % file['depotFile'])
 +            text = p4_read_pipe(['print', '-q', '-o', '-', file['depotFile']])
              contents = [ text ]
  
+         if type_base == "apple":
+             # Apple filetype files will be streamed as a concatenation of
+             # its appledouble header and the contents.  This is useless
+             # on both macs and non-macs.  If using "print -q -o xx", it
+             # will create "xx" with the data, and "%xx" with the header.
+             # This is also not very useful.
+             #
+             # Ideally, someday, this script can learn how to generate
+             # appledouble files directly and import those to git, but
+             # non-mac machines can never find a use for apple filetype.
+             print "\nIgnoring apple filetype file %s" % file['depotFile']
+             return
+ 
          # Perhaps windows wants unicode, utf16 newlines translated too;
          # but this is not doing it.
          if self.isWindows and type_base == "text":