summaryrefslogtreecommitdiff
path: root/contrib/fast-import
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2011-11-05 17:36:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-11-06 06:17:52 (GMT)
commit9f7ef0eaf2e54609128add5e8f9b506bdbb81dff (patch)
treef6dcf6261f2f6efea2d7ecaa0bb3ecf8e79560e2 /contrib/fast-import
parent97a21ca50ef893a171a50c863fe21a924935fd2a (diff)
downloadgit-9f7ef0eaf2e54609128add5e8f9b506bdbb81dff.zip
git-9f7ef0eaf2e54609128add5e8f9b506bdbb81dff.tar.gz
git-9f7ef0eaf2e54609128add5e8f9b506bdbb81dff.tar.bz2
git-p4: ignore apple filetype
Revert 97a21ca (git-p4: stop ignoring apple filetype, 2011-10-16) and add a test case. Reported-by: Michael Wookey <michaelwookey@gmail.com> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 6b91595..da1db4a 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1272,6 +1272,19 @@ class P4Sync(Command, P4UserMap):
text = p4_read_pipe('print -q -o - "%s"' % 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":