From: "Torsten Bögershausen" <tboegi@web.de>
To: Lars Schneider <larsxschneider@gmail.com>,
eyvind.bernhardsen@gmail.com,
Git Mailing List <git@vger.kernel.org>
Subject: Re: t0025 flaky on OSX
Date: Mon, 24 Apr 2017 21:48:30 +0200 [thread overview]
Message-ID: <11da00e8-a62c-bf07-d97e-ab755647082b@web.de> (raw)
In-Reply-To: <e6343f94-3fad-e323-cb38-8ea1148cec3f@web.de>
On 2017-04-24 19:00, Torsten Bögershausen wrote:
> On 2017-04-24 18:45, Lars Schneider wrote:
>> Hi,
>>
>> "t0025.3 - crlf=true causes a CRLF file to be normalized" failed
>> sporadically on next and master recently:
>> https://travis-ci.org/git/git/jobs/225084459#L2382
>> https://travis-ci.org/git/git/jobs/223830505#L2342
>>
>> Are you aware of a race condition in the code
>> or in the test?
> Not yet - I'll have a look
>
So,
The test failed under Linux & pu of the day, using Peff's
stress script.
not ok 3 - crlf=true causes a CRLF file to be normalized
The good case (simplified):
$ git status
modified: CRLFonly
Untracked files:
.gitattributes
$ git diff | tr "\015" Q
warning: CRLF will be replaced by LF in CRLFonly.
The file will have its original line endings in your working directory.
diff --git a/CRLFonly b/CRLFonly
index 44fc21c..666dbf4 100644
--- a/CRLFonly
+++ b/CRLFonly
@@ -1,7 +1,7 @@
-IQ
-amQ
-veryQ
-veryQ
-fineQ
-thankQ
-youQ
+I
+am
+very
+very
+fine
+thank
+you
--------------------
The failed case:
$ git status
Untracked files:
.gitattributes
-----------------------
$ ls -al -i
total 28
3430195 drwxr-xr-x 3 tb tb 4096 Apr 24 21:19 .
3427617 drwxr-xr-x 3 tb tb 4096 Apr 24 21:19 ..
3429958 -rw-r--r-- 1 tb tb 37 Apr 24 21:19 CRLFonly
3432574 drwxr-xr-x 8 tb tb 4096 Apr 24 21:27 .git
3425599 -rw-r--r-- 1 tb tb 14 Apr 24 21:19 .gitattributes
3430089 -rw-r--r-- 1 tb tb 24 Apr 24 21:19 LFonly
3430174 -rw-r--r-- 1 tb tb 36 Apr 24 21:19 LFwithNUL
-----------------
#After
$ mv CRLFonly tmp
$ cp tmp CRLFonly
$ ls -al -i
3430195 drwxr-xr-x 3 tb tb 4096 Apr 24 21:36 .
3427617 drwxr-xr-x 3 tb tb 4096 Apr 24 21:19 ..
3401599 -rw-r--r-- 1 tb tb 37 Apr 24 21:36 CRLFonly
3432574 drwxr-xr-x 8 tb tb 4096 Apr 24 21:36 .git
3425599 -rw-r--r-- 1 tb tb 14 Apr 24 21:19 .gitattributes
3430089 -rw-r--r-- 1 tb tb 24 Apr 24 21:19 LFonly
3430174 -rw-r--r-- 1 tb tb 36 Apr 24 21:19 LFwithNUL
3429958 -rw-r--r-- 1 tb tb 37 Apr 24 21:19 tmp
$ git status
modified: CRLFonly
Untracked files:
.gitattributes
tmp
So all in all it seams as if there is a very old race condition here,
which we "never" have seen yet.
Moving the file to a different inode number fixes the test case,
Git doesn't treat it as unchanged any more.
next prev parent reply other threads:[~2017-04-24 19:48 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <461E433C-DC8E-42FE-9B23-4A76BEFE0D11@gmail.com>
2017-04-24 17:00 ` t0025 flaky on OSX Torsten Bögershausen
2017-04-24 19:48 ` Torsten Bögershausen [this message]
2017-04-25 17:42 ` Lars Schneider
2017-04-26 4:12 ` Torsten Bögershausen
2017-04-26 19:41 ` Lars Schneider
2017-04-29 15:34 ` [PATCH/RFC 1/1] t0027: Some tests are not expensive tboegi
2017-05-01 3:07 ` Junio C Hamano
2017-05-01 4:52 ` Torsten Bögershausen
2017-05-02 15:56 ` [PATCH v2 1/1] t0027: tests are not expensive; remove t0025 tboegi
2017-05-02 16:11 ` Johannes Schindelin
2017-05-09 1:29 ` Junio C Hamano
2017-05-09 4:12 ` Torsten Bögershausen
2017-05-10 14:06 ` [PATCH v3 " tboegi
2017-05-10 15:52 ` Johannes Schindelin
2017-05-10 19:55 ` Torstem Bögershausen
2017-05-11 2:17 ` Junio C Hamano
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=11da00e8-a62c-bf07-d97e-ab755647082b@web.de \
--to=tboegi@web.de \
--cc=eyvind.bernhardsen@gmail.com \
--cc=git@vger.kernel.org \
--cc=larsxschneider@gmail.com \
/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).