git whitespace test

git whitespace test

[Ulrich Drepper]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

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.

- --
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA ❖
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAko2b70ACgkQ2ijCOnn/RHQ2CgCgw1bX3XdatBxZmETLsYUaYleb
Y94AoKfUhnbmoWs6oWiXr+KDm7jveUlu
=nSlJ
-----END PGP SIGNATURE-----

Re: git whitespace test

[Jim Meyering]

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 <meyering@redhat.com>
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  <meyering@redhat.com>
+
+	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  <drepper@redhat.com>

 	* timezone/tzselect.ksh: Update from tzcode2009i.
--
1.6.3.2.406.gd6a466

Re: git whitespace test

[Ulrich Drepper]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jim Meyering wrote:
> 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.

If this works, sure.

- --
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA ❖
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAko2c+MACgkQ2ijCOnn/RHTdYACfWL9KTp1xMlC9rdV0jZvBijB0
g1oAoLmwRLnOeLos4e4OCaQnklTa3wj3
=Muw+
-----END PGP SIGNATURE-----

Re: git whitespace test

[Jim Meyering]

Ulrich Drepper wrote:
> Jim Meyering wrote:
>> 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.
>
> If this works, sure.

Ok.  I've pushed the .gitattributes-adding patch (without
the ChangeLog entry, as you requested) and reverted
the server-side setting to hooks.allowbadwhitespace=false.