Re: Checking in files with trailing white space

[Lars Ingebrigtsen]

Alan Mackenzie <address@hidden> writes:

>> > I'm adding test cases for the shr HTML rendering, and in some of the
>> > tests there should really be trailing white space in the result files.
>> > Is there a way to say that the test/data/shr directory should be allowed
>> > to have trailing spaces in our git/checkin thing?
>
>> Never mind; found it...
>
> Would some kind soul please tell me the recipe.  I've just merged master
> into a nine-month old branch, and I get lots of these whitespace errors
> when I try to commit the merge.

Hm...  sorry, I've forgotten again.  But I don't think what you're
seeing is related to what I was talking about.  The git/checkin script
refuses to check in files with whitespace at the end of lines, while it
sounds like you have something different going on...

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no