From patchwork Fri Nov 8 10:13:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Veeraiyan Chidambaram X-Patchwork-Id: 1192042 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=de.adit-jv.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 478m5h4p7fz9s7T for ; Sat, 9 Nov 2019 03:32:39 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 54746C21F3B; Fri, 8 Nov 2019 16:28:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 0FEB2C21E89; Fri, 8 Nov 2019 16:28:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1FE2CC21C38; Fri, 8 Nov 2019 10:13:51 +0000 (UTC) Received: from smtp1.de.adit-jv.com (smtp1.de.adit-jv.com [93.241.18.167]) by lists.denx.de (Postfix) with ESMTPS id 9CA89C21BE5 for ; Fri, 8 Nov 2019 10:13:50 +0000 (UTC) Received: from localhost (smtp1.de.adit-jv.com [127.0.0.1]) by smtp1.de.adit-jv.com (Postfix) with ESMTP id 1DDF33C057C; Fri, 8 Nov 2019 11:13:50 +0100 (CET) Received: from smtp1.de.adit-jv.com ([127.0.0.1]) by localhost (smtp1.de.adit-jv.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id n97rMTaqFl76; Fri, 8 Nov 2019 11:13:42 +0100 (CET) Received: from HI2EXCH01.adit-jv.com (hi2exch01.adit-jv.com [10.72.92.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by smtp1.de.adit-jv.com (Postfix) with ESMTPS id 8B0EB3C009D; Fri, 8 Nov 2019 11:13:42 +0100 (CET) Received: from vmlxhi-070.adit-jv.com (10.72.93.148) by HI2EXCH01.adit-jv.com (10.72.92.24) with Microsoft SMTP Server (TLS) id 14.3.468.0; Fri, 8 Nov 2019 11:13:42 +0100 From: Veeraiyan Chidambaram To: u-boot , Bin Meng Date: Fri, 8 Nov 2019 11:13:35 +0100 Message-ID: <1573208015-1355-1-git-send-email-external.veeraiyan.c@de.adit-jv.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [10.72.93.148] X-Mailman-Approved-At: Fri, 08 Nov 2019 16:28:19 +0000 Cc: Farkas Bastian , Veeraiyan Chidambaram , Vignesh Rajendran , Chidambaram Veeraiyan , Rosca Eugeniu , Franzen Tobias Subject: [U-Boot] [PATCH v3] gitattributes: dont treat non-text files as text X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Vignesh Rajendran With recent update in u-boot gitattributes all files are treated as regular text files. This creates problems with special files and repo always shows uncommitted files like below. Your branch is up-to-date with 'origin/master'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: tools/img2brec.sh modified: tools/logos/compulab.bmp modified: tools/logos/denx-comp.bmp modified: tools/logos/toradex.bmp To fix above problem special files bmp/ttf files are treated as binary files in the gitattributes. Signed-off-by: Vignesh Rajendran Signed-off-by: Veeraiyan Chidambaram --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitattributes b/.gitattributes index 8560b794c0a7..899473ab0fbb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,5 @@ # Declare files that always have LF line endings on checkout * text eol=lf +# Denote all files that are truly binary and should not be modified +*.bmp binary +*.ttf binary