From: Pete Wyckoff <pw@padd•com>
To: git@vger•kernel.org
Cc: Vitor Antunes <vitor.hda@gmail•com>,
Luke Diamand <luke@diamand•org>, Chris Li <git@chrisli•org>,
Junio C Hamano <gitster@pobox•com>
Subject: [PATCH 4/5] git-p4: stop ignoring apple filetype
Date: Sat, 17 Sep 2011 21:32:36 -0400 [thread overview]
Message-ID: <20110918013236.GE4619@arf.padd.com> (raw)
In-Reply-To: <20110918012634.GA4578@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.
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 931cf5f..eee288d 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-09-18 1:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-18 1:26 [PATCH 0/5] git-p4 filetype handling Pete Wyckoff
2011-09-18 1:27 ` [PATCH 1/5] git-p4 tests: refactor, split out common functions Pete Wyckoff
2011-09-18 21:48 ` Junio C Hamano
2011-09-21 1:29 ` Pete Wyckoff
2011-09-21 2:34 ` Junio C Hamano
2011-09-21 2:35 ` Junio C Hamano
2011-09-18 1:28 ` [PATCH 2/5] git-p4: handle utf16 filetype properly Pete Wyckoff
2011-09-23 18:01 ` Luke Diamand
2011-09-18 1:29 ` Pete Wyckoff
2011-09-18 1:31 ` [PATCH 3/5] git-p4: recognize all p4 filetypes Pete Wyckoff
2011-09-18 1:32 ` Pete Wyckoff [this message]
2011-09-18 1:33 ` [PATCH 5/5] git-p4: keyword flattening fixes Pete Wyckoff
2011-09-23 17:56 ` [PATCH 0/5] git-p4 filetype handling Luke Diamand
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=20110918013236.GE4619@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 \
--cc=vitor.hda@gmail$(echo .)com \
/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