From: Pete Wyckoff <pw@padd•com>
To: git@vger•kernel.org
Cc: Junio C Hamano <gitster@pobox•com>,
Luke Diamand <luke@diamand•org>, Chris Li <git@chrisli•org>
Subject: [PATCH 4/6] git-p4: stop ignoring apple filetype
Date: Sat, 15 Oct 2011 11:59:08 -0400 [thread overview]
Message-ID: <20111015155908.GE29436@arf.padd.com> (raw)
In-Reply-To: <20111015155358.GA29436@arf.padd.com>
Currently "apple" filetype is ignored explicitly, and the file is
not even included in the git repository. This seems wrong.
Remove this, letting it be treated like a "binary" filetype.
Acked-by: Luke Diamand <luke@diamand•org>
Signed-off-by: Pete Wyckoff <pw@padd•com>
---
contrib/fast-import/git-p4 | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 0490ca5..6b91595 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1247,11 +1247,6 @@ class P4Sync(Command, P4UserMap):
# - helper for streamP4Files
def streamOneP4File(self, file, contents):
- if file["type"] == "apple":
- print "\nfile %s is a strange apple file that forks. Ignoring" % \
- file['depotFile']
- return
-
relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)
relPath = self.wildcard_decode(relPath)
if verbose:
--
1.7.6.3
next prev parent reply other threads:[~2011-10-15 15:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-15 15:53 [PATCH v2 0/6] git-p4 tests, filetypes, shell metacharacters Pete Wyckoff
2011-10-15 15:55 ` [PATCH 1/6] git-p4 tests: refactor and cleanup Pete Wyckoff
2011-10-16 9:38 ` Stefano Lattarini
2011-10-16 9:54 ` Stefano Lattarini
2011-10-16 14:35 ` Pete Wyckoff
2011-10-15 15:56 ` [PATCH 2/6] git-p4: handle utf16 filetype properly Pete Wyckoff
2011-10-16 9:52 ` Stefano Lattarini
2011-10-16 14:38 ` Pete Wyckoff
2011-10-15 15:57 ` [PATCH 3/6] git-p4: recognize all p4 filetypes Pete Wyckoff
2011-10-15 15:59 ` Pete Wyckoff [this message]
2011-10-15 16:00 ` [PATCH 5/6] git-p4: keyword flattening fixes Pete Wyckoff
2011-10-15 16:02 ` [PATCH 6/6] git-p4: handle files with shell metacharacters Pete Wyckoff
2011-10-15 20:00 ` [PATCH v2 0/6] git-p4 tests, filetypes, " Luke Diamand
-- strict thread matches above, loose matches on Subject: below --
2011-10-16 14:42 [PATCH v3 " Pete Wyckoff
2011-10-16 14:45 ` [PATCH 4/6] git-p4: stop ignoring apple filetype Pete Wyckoff
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111015155908.GE29436@arf.padd.com \
--to=pw@padd$(echo .)com \
--cc=git@chrisli$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=luke@diamand$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox