From: Yann Droneaud <ydroneaud@opteya.com>
To: <git@vger.kernel.org>
Subject: Re: [PATCH] t0020-crlf: test rebase with text conversion and safecrlf
Date: Fri, 21 Jun 2013 16:24:57 +0200 [thread overview]
Message-ID: <41e212cf1702cd60114f522f96627d20@meuh.org> (raw)
In-Reply-To: <1371824124-4242-1-git-send-email-ydroneaud@opteya.com>
Le 21.06.2013 16:15, Yann Droneaud a écrit :
> 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
next prev parent reply other threads:[~2013-06-21 14:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-21 13:41 git rebase fail with CRLF conversion Yann Droneaud
2013-06-21 13:51 ` Yann Droneaud
2013-06-21 14:15 ` [PATCH] t0020-crlf: test rebase with text conversion and safecrlf Yann Droneaud
2013-06-21 14:24 ` Yann Droneaud [this message]
2013-06-21 14:29 ` git rebase fail with CRLF conversion Yann Droneaud
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=41e212cf1702cd60114f522f96627d20@meuh.org \
--to=ydroneaud@opteya.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).