Re: [PATCH] t0020-crlf: test rebase with text conversion and safecrlf

From: Yann Droneaud <ydroneaud@opteya.com>
Date: Jun 21, 2013, 14:24 UTC
Message-ID: <41e212cf1702cd60114f522f96627d20@meuh.org>
In-Reply-To: <1371824124-4242-1-git-send-email-ydroneaud@opteya.com>

Le 21.06.2013 16:15, Yann Droneaud a écrit :

Show 16 quoted lines

> This patch add two tests to reproduce the problems described
> in thread "git rebase fail with CRLF conversion"
>  <fb20a7d711fdd218f58f1f2090b1c515@meuh.org>
>  <http://thread.gmane.org/gmane.comp.version-control.git/228613>
>  <http://marc.info/?l=git&m=137182211414404&w=2>
>
> - Add and commit a file with CRLF,
> - Add and commit a .gitattributes with text flag for the file,
> - Convert CRLF to LF in file, commit the change,
> - Rebase the whole on top of another parent
>   The rebase currently failed.
>
> This scenario is repeated twice, first with core.safecrlf set to 
> warn,
> a second time with core.safecrlf set to true.
>

Note: those two tests might failed as described in message

"git rebase fail with CRLF conversion"
  <fb20a7d711fdd218f58f1f2090b1c515@meuh.org>
  <http://thread.gmane.org/gmane.comp.version-control.git/228613>
  <http://marc.info/?l=git&m=137182211414404&w=2>

I haven't found a testcase to reproduce the same exact failure at will.

So this patch should probably not used asis until the two kind of errors can be reproduced.

Additionnaly, It should also be tested on a CRLF system (Windows).

> git diff will also fail when core.safecrlf is set to true
> and the file is not already converted to LF.
>

It might be a test on its own.

Regards

-- 
Yann Droneaud
OPTEYA