On Thu, Mar 4, 2010 at 1:02 AM, Junio C Hamano <gitster@pobox.com> wrote:

quoted text
> * bg/apply-fix-blank-at-eof (2010-02-27) 5 commits
>  - t3417: Add test cases for "rebase --whitespace=fix"
>  - t4124: Add additional tests of --whitespace=fix
>  - apply: Allow blank context lines to match beyond EOF
>  - apply: Remove the quick rejection test
>  - apply: Don't unnecessarily update line lengths in the preimage
>
> Probably ready for 'next'.

I have realized that there is one remaining minor issue.

If both --whitespace=fix and --ignore-space-change are given,
new blank lines ending in LF may be added to the end of the file.
That is the expected behavior if the rest of the file has
LF line endings, but not if the rest of the file has CR-LF
line endings.

I think I have figured out how to fix it and I will send
a patch as soon as I have actually implemented it.

-- 
Björn Gustavsson, Erlang/OTP, Ericsson AB
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html