* [PATCH] t0020: make sure the test file is lf to start with
@ 2012-06-10 10:32 vfr
2012-06-10 10:47 ` [msysGit] " Johannes Schindelin
0 siblings, 1 reply; 4+ messages in thread
From: vfr @ 2012-06-10 10:32 UTC (permalink / raw)
To: git; +Cc: msysgit, Vincent van Ravesteijn
From: Vincent van Ravesteijn <vfr@lyx.org>
On Windows, the perl interpreter used by q_to_nul also converts the
eol-style to crlf. Because the eol-style is now wrong from the beginning, the
later tests '.gitattributes says two is binary' and 'checkout with
existing .gitattributes' fail. This patch makes sure that the eol-style is
lf when the test file is setup and makes the tests to pass also on
Windows.
Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
---
I'm not sure everyone will like this solution to fix a problem that is only present on Windows. I'd be happy to discuss a different solution.
t/t0020-crlf.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh
index 1a8f44c..4c41b6e 100755
--- a/t/t0020-crlf.sh
+++ b/t/t0020-crlf.sh
@@ -15,7 +15,7 @@ test_expect_success setup '
for w in Hello world how are you; do echo $w; done >one &&
mkdir dir &&
for w in I am very very fine thank you; do echo $w; done >dir/two &&
- for w in Oh here is NULQin text here; do echo $w; done | q_to_nul >three &&
+ for w in Oh here is NULQin text here; do echo $w; done | q_to_nul | remove_cr >three &&
git add . &&
git commit -m initial &&
--
1.7.9.msysgit.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [msysGit] [PATCH] t0020: make sure the test file is lf to start with
2012-06-10 10:32 [PATCH] t0020: make sure the test file is lf to start with vfr
@ 2012-06-10 10:47 ` Johannes Schindelin
2012-06-10 11:01 ` Vincent van Ravesteijn
0 siblings, 1 reply; 4+ messages in thread
From: Johannes Schindelin @ 2012-06-10 10:47 UTC (permalink / raw)
To: Vincent van Ravesteijn; +Cc: git, msysgit
Hi Vincent,
On Sun, 10 Jun 2012, vfr@lyx.org wrote:
> On Windows, the perl interpreter used by q_to_nul also converts the
> eol-style to crlf.
First: thanks for working on this, and thanks also for Cc:ing the msysgit
list.
> Because the eol-style is now wrong from the beginning, the later tests
> '.gitattributes says two is binary' and 'checkout with existing
> .gitattributes' fail.
I wonder why it does not fail here:
https://qa.nest-initiative.org/job/msysgit-test/24/console
IOW I think there is a difference between the msysGit setup and your
setup...
Ciao,
Johannes
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] t0020: make sure the test file is lf to start with
2012-06-10 10:47 ` [msysGit] " Johannes Schindelin
@ 2012-06-10 11:01 ` Vincent van Ravesteijn
2012-06-10 12:50 ` Johannes Schindelin
0 siblings, 1 reply; 4+ messages in thread
From: Vincent van Ravesteijn @ 2012-06-10 11:01 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git, msysgit
Op 10-6-2012 12:47, Johannes Schindelin schreef:
> Hi Vincent,
>
>> Because the eol-style is now wrong from the beginning, the later tests
>> '.gitattributes says two is binary' and 'checkout with existing
>> .gitattributes' fail.
> I wonder why it does not fail here:
>
> https://qa.nest-initiative.org/job/msysgit-test/24/console
>
> IOW I think there is a difference between the msysGit setup and your
> setup...
I compiled git using MSVC and try to run it in the Windows cmd prompt.
Consequently it doesn't use the perl that is distributed with msysgit,
but it uses the perl that I've installed on my Windows system
(Strawberry Perl; http://strawberryperl.com/).
When I modify the paths such that git uses the perl.exe distributed with
msysgit the tests run ok.
Vincent
--
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.
You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] t0020: make sure the test file is lf to start with
2012-06-10 11:01 ` Vincent van Ravesteijn
@ 2012-06-10 12:50 ` Johannes Schindelin
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Schindelin @ 2012-06-10 12:50 UTC (permalink / raw)
To: Vincent van Ravesteijn; +Cc: git, msysgit
Hi Vincent,
On Sun, 10 Jun 2012, Vincent van Ravesteijn wrote:
> Op 10-6-2012 12:47, Johannes Schindelin schreef:
> >
> > > Because the eol-style is now wrong from the beginning, the later
> > > tests '.gitattributes says two is binary' and 'checkout with
> > > existing .gitattributes' fail.
>
> > I wonder why it does not fail here:
> >
> > https://qa.nest-initiative.org/job/msysgit-test/24/console
> >
> > IOW I think there is a difference between the msysGit setup and your
> > setup...
>
> I compiled git using MSVC and try to run it in the Windows cmd prompt.
> Consequently it doesn't use the perl that is distributed with msysgit,
> but it uses the perl that I've installed on my Windows system
> (Strawberry Perl; http://strawberryperl.com/).
Ah, now it makes sense. Maybe a valuable information to convey in the
commit message?
> When I modify the paths such that git uses the perl.exe distributed with
> msysgit the tests run ok.
Again, a valuable information for the commit message.
Also, I suspect that many, many more places should be affected by that
Perl's behavior...
Ciao,
Johannes
--
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.
You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-06-10 12:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-10 10:32 [PATCH] t0020: make sure the test file is lf to start with vfr
2012-06-10 10:47 ` [msysGit] " Johannes Schindelin
2012-06-10 11:01 ` Vincent van Ravesteijn
2012-06-10 12:50 ` Johannes Schindelin
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).