From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7253 invoked by alias); 15 Jun 2009 16:06:57 -0000 Received: (qmail 7237 invoked by uid 22791); 15 Jun 2009 16:06:57 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 15 Jun 2009 16:06:51 +0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n5FG6n8R031937 for ; Mon, 15 Jun 2009 12:06:49 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n5FG6m5x014648 for ; Mon, 15 Jun 2009 12:06:48 -0400 Received: from mx.meyering.net (sebastian-int.corp.redhat.com [172.16.52.221]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n5FG6lCk028497; Mon, 15 Jun 2009 12:06:48 -0400 Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000) id BEBD4346D2; Mon, 15 Jun 2009 18:06:47 +0200 (CEST) From: Jim Meyering To: Ulrich Drepper Cc: GNU libc hacker Subject: Re: git whitespace test In-Reply-To: <4A366FBD.3060803@redhat.com> (Ulrich Drepper's message of "Mon, 15 Jun 2009 08:58:53 -0700") References: <4A366FBD.3060803@redhat.com> Date: Mon, 15 Jun 2009 16:06:00 -0000 Message-ID: <87k53djxbc.fsf@meyering.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2009-06/txt/msg00004.txt.bz2 Ulrich Drepper wrote: > I had to set > > hooks.allowbadwhitespace > > in glibc's git to true. The timezone data files have trailing > whitespaces and I don't want to make these unnecessary changes which > just make tracking upstream harder. We lived in cvs days without this. > Every file I edit gets automatically fixed anyway. How about an alternative: use a .gitattributes file to exempt just those files. Then we can turn the global hook back on, and relax policy as needed by modifying .gitattributes. Here's a proposed patch. >From b92e815818d1389c45174e34527063723e291a95 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 15 Jun 2009 18:03:56 +0200 Subject: [PATCH] exempt timezone files from the no-bad-whitespace policy * .gitattributes: New file. Exempt imported timezone files from the no-bad-whitespace rules. --- .gitattributes | 1 + ChangeLog | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8947e72 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +timezone/* -whitespace diff --git a/ChangeLog b/ChangeLog index dcd7444..ac37750 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-06-15 Jim Meyering + + exempt timezone files from the no-bad-whitespace policy + * .gitattributes: New file. Exempt imported timezone files from + the no-bad-whitespace rules. + 2009-06-15 Ulrich Drepper * timezone/tzselect.ksh: Update from tzcode2009i. -- 1.6.3.2.406.gd6a466