Bruno Haible wrote:
>> >> Since I prefer that the hook continue to apply to all files
>> >> for which I have a say, perhaps you'd like to itemize the files
>> >> for which you want to allow trailing blank lines?
>> >
>> > Yes. These should be: modules/**/* and **/ChangeLog*. I believe it
>>
>> My p
Hi Jim,
> >> Since I prefer that the hook continue to apply to all files
> >> for which I have a say, perhaps you'd like to itemize the files
> >> for which you want to allow trailing blank lines?
> >
> > Yes. These should be: modules/**/* and **/ChangeLog*. I believe it
>
> My point was that I'd
Bruno Haible wrote:
> # "git diff --check" should not reject modules files which end in a blank
> line.
> * whitespace=-trail
> ===
>
> But "git push" is now still rejected:
>
> modules/pipe-filter:34: ends with blank li
Bruno Haible wrote:
> Hi Jim,
>
>> Actually, I see trailing blank lines in any text file
>> as an opportunity for unexpected merge conflicts, as
>> one person adds or removes one of those oft-unnoticed lines,
>> and someone else makes a conflicting change.
>
> Conflicts generally occur at spots th
Hi Jim,
> > FYI, this change in behavior is the result of savannah upgrading to
> > the latest version of git, whose git diff --check tests for that.
Thanks for the pointer. Indeed, the relevant git changes are:
http://git.kernel.org/?p=git/git.git;a=commitdiff;h=877f23ccb88227203f2576abdfb5d1c15
Hi Jim,
> Actually, I see trailing blank lines in any text file
> as an opportunity for unexpected merge conflicts, as
> one person adds or removes one of those oft-unnoticed lines,
> and someone else makes a conflicting change.
Conflicts generally occur at spots that are heavily modified,
such a
Bruno Haible wrote:
> Hi Jim,
>
> The git server at savannah now rejects the normal form of module
> descriptions. I got this error message:
>
> modules/pipe-filter:34: ends with blank lines.
> error: hooks/update exited with error code 2
> error: hook declined to update refs/heads/master
>
>
