summaryrefslogtreecommitdiff
path: root/contrib/fast-import
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-11-07 05:21:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-11-07 05:21:57 (GMT)
commitde263479506066f240cf629aa3aac50c94668d89 (patch)
tree2cb3992abf176354aed9cef273aa73932ea523e5 /contrib/fast-import
parentee6dfb2d83ba1b057943e705f707fa27e34e47f9 (diff)
parent9f7ef0eaf2e54609128add5e8f9b506bdbb81dff (diff)
downloadgit-de263479506066f240cf629aa3aac50c94668d89.zip
git-de263479506066f240cf629aa3aac50c94668d89.tar.gz
git-de263479506066f240cf629aa3aac50c94668d89.tar.bz2
Merge branch 'pw/p4-appledouble-fix'
* pw/p4-appledouble-fix: git-p4: ignore apple filetype
Diffstat (limited to 'contrib/fast-import')
-rwxr-xr-xcontrib/fast-import/git-p413
1 files changed, 13 insertions, 0 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index f885d70..b975d67 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1318,6 +1318,19 @@ class P4Sync(Command, P4UserMap):
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":