From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pete Wyckoff Subject: [PATCH 4/6] git-p4: stop ignoring apple filetype Date: Sun, 16 Oct 2011 10:45:49 -0400 Message-ID: <20111016144549.GG22144@arf.padd.com> References: <20111016144215.GC22144@arf.padd.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Junio C Hamano , Luke Diamand , Chris Li , Stefano Lattarini To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Oct 16 16:46:11 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RFRyc-0006aR-Ln for gcvg-git-2@lo.gmane.org; Sun, 16 Oct 2011 16:46:11 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754583Ab1JPOqF (ORCPT ); Sun, 16 Oct 2011 10:46:05 -0400 Received: from honk.padd.com ([74.3.171.149]:57952 "EHLO honk.padd.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754442Ab1JPOqF (ORCPT ); Sun, 16 Oct 2011 10:46:05 -0400 Received: from arf.padd.com (unknown [50.55.131.180]) by honk.padd.com (Postfix) with ESMTPSA id D9A241FEA; Sun, 16 Oct 2011 07:46:03 -0700 (PDT) Received: by arf.padd.com (Postfix, from userid 7770) id 5FB84313B8; Sun, 16 Oct 2011 10:45:49 -0400 (EDT) Content-Disposition: inline In-Reply-To: <20111016144215.GC22144@arf.padd.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 Signed-off-by: Pete Wyckoff --- 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.7