From: "Torsten Bögershausen" <tboegi@web.de>
To: Matt McCutchen <matt@mattmccutchen.net>
Cc: git <git@vger.kernel.org>
Subject: Re: Duplicate safecrlf warning for racily clean index entry
Date: Wed, 21 Feb 2018 08:53:23 +0100 [thread overview]
Message-ID: <20180221075323.GA18213@tor.lan> (raw)
In-Reply-To: <1519134146.6055.23.camel@mattmccutchen.net>
On Tue, Feb 20, 2018 at 08:42:26AM -0500, Matt McCutchen wrote:
> I noticed that if a file subject to a safecrlf warning is added to the
> index in the same second that it is created, resulting in a "racily
> clean" index entry, then a subsequent "git add" command prints another
> safecrlf warning. I reproduced this on the current "next"
> (499d7c4f91). The procedure:
>
> $ git init
> $ git config core.autocrlf true
> $ echo foo >file1 && git add file1 && git add file1
> warning: LF will be replaced by CRLF in file1.
> The file will have its original line endings in your working directory.
> warning: LF will be replaced by CRLF in file1.
> The file will have its original line endings in your working directory.
> $ echo bar >file2 && sleep 1 && git add file2 && git add file2
> warning: LF will be replaced by CRLF in file2.
> The file will have its original line endings in your working directory.
>
> This came up when I ran the test suite for Braid on Windows
> (https://github.com/cristibalan/braid/issues/77).
I think a .gitattributes file could/should be used. I'll answer
there seperatly.
>
> The phenomenon actually seems to be more general: touching the file
> causes the next "git add" to print a safecrlf warning, suggesting that
> the warning occurs whenever the index entry is dirty. One could argue
> that a new warning is reasonable after touching the file, but it seems
> clear that "racy cleanliness" is an implementation detail that
> shouldn't have user-visible nondeterministic effects.
>
> In either case, if "git update-index --refresh" (or "git status") is
> run before "git add", then "git add" does not print the warning. On
> the other hand, if line endings in the working tree file are changed,
> then git shows the file as having an unstaged change, even though the
> content that would be added to the index after CRLF conversion is
> identical. So it seems that git remembers the pre-conversion file
> content and uses it for "git update-index --refresh" and would just
> need to use it for "git add" as well.
>
> Thoughts about the proposed change? Does someone want to work on it or
> give me a pointer to where to get started?
Good analyzes, thanks for that.
I don't hava a pointer, but what should happen ?
2 warnings for 2 "git add" should be OK, I think.
1 warning is part of the optimization, that Git does to handle
hundrets and thousands of files efficciently.
Is the 1/2 warning real live problem ?
>
> Thanks,
> Matt
next prev parent reply other threads:[~2018-02-21 7:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-20 13:42 Duplicate safecrlf warning for racily clean index entry Matt McCutchen
2018-02-21 7:53 ` Torsten Bögershausen [this message]
2018-02-21 13:57 ` Matt McCutchen
2018-02-21 13:47 ` Matt McCutchen
2018-02-21 17:20 ` 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=20180221075323.GA18213@tor.lan \
--to=tboegi@web.de \
--cc=git@vger.kernel.org \
--cc=matt@mattmccutchen.net \
/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).