From: "Torsten Bögershausen" <tboegi@web.de>
To: Junio C Hamano <gitster@pobox.com>, Clemens Buchacher <drizzd@aon.at>
Cc: "Thomas Gummerer" <t.gummerer@gmail.com>,
"Jeff King" <peff@peff.net>,
"Torsten Bögershausen" <tboegi@web.de>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
"Lars Schneider" <larsxschneider@gmail.com>,
"Mike Hommey" <mh@glandium.org>,
git@vger.kernel.org
Subject: Re: [PATCH] travis-ci: run previously failed tests first, then slowest to fastest
Date: Mon, 1 Feb 2016 21:26:54 +0100 [thread overview]
Message-ID: <56AFBF8E.7090809@web.de> (raw)
In-Reply-To: <xmqqlh74wb0r.fsf@gitster.mtv.corp.google.com>
On 2016-02-01 19.17, Junio C Hamano wrote:
> Clemens Buchacher <drizzd@aon.at> writes:
[]
>
> IIRC, autocrlf=true would strip CR at the end of line in to-git
> conversion, and would add CR in to-worktree conversion. So some eol
> conversion may only act in to-git, but some others do affect both,
> and without needing you to touch attributes.
That depends, which version of Git you are running.
It has changed from the first version of core.autocrlf:
commit c4805393d73425a5f467f10fa434fb99bfba17ac
Author: Finn Arne Gangstad <finnag@pvv.org>
Date: Wed May 12 00:37:57 2010 +0200
autocrlf: Make it work also for un-normalized repositories
Previously, autocrlf would only work well for normalized
repositories. Any text files that contained CRLF in the repository
would cause problems, and would be modified when handled with
core.autocrlf set.
Change autocrlf to not do any conversions to files that in the
repository already contain a CR. git with autocrlf set will never
create such a file, or change a LF only file to contain CRs, so the
(new) assumption is that if a file contains a CR, it is intentional,
and autocrlf should not change that.
The following sequence should now always be a NOP even with autocrlf
set (assuming a clean working directory):
git checkout <something>
touch *
git add -A . (will add nothing)
git commit (nothing to commit)
Previously this would break for any text file containing a CR.
Some of you may have been folowing Eyvind's excellent thread about
trying to make end-of-line translation in git a bit smoother.
I decided to attack the problem from a different angle: Is it possible
to make autocrlf behave non-destructively for all the previous problem cases?
Stealing the problem from Eyvind's initial mail (paraphrased and
summarized a bit):
1. Setting autocrlf globally is a pain since autocrlf does not work well
with CRLF in the repo
2. Setting it in individual repos is hard since you do it "too late"
(the clone will get it wrong)
3. If someone checks in a file with CRLF later, you get into problems again
4. If a repository once has contained CRLF, you can't tell autocrlf
at which commit everything is sane again
5. autocrlf does needless work if you know that all your users want
the same EOL style.
I belive that this patch makes autocrlf a safe (and good) default
setting for Windows, and this solves problems 1-4 (it solves 2 by being
set by default, which is early enough for clone).
I implemented it by looking for CR charactes in the index, and
aborting any conversion attempt if this is found.
-----------------------
And my intention is to do a similar fix for the attributes.
More patches coming.
next prev parent reply other threads:[~2016-02-01 20:28 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-19 9:24 [PATCH] travis-ci: run previously failed tests first, then slowest to fastest larsxschneider
2016-01-19 19:12 ` Jeff King
2016-01-19 23:00 ` Junio C Hamano
2016-01-20 0:26 ` Mike Hommey
2016-01-20 1:46 ` Junio C Hamano
2016-01-20 1:56 ` Jeff King
2016-01-20 9:22 ` Lars Schneider
2016-01-22 2:33 ` brian m. carlson
2016-01-22 5:52 ` Jeff King
2016-01-22 6:07 ` Jeff King
2016-01-24 14:34 ` Thomas Gummerer
2016-01-24 20:03 ` Junio C Hamano
2016-01-24 22:05 ` Junio C Hamano
2016-01-25 14:42 ` Thomas Gummerer
2016-01-25 17:26 ` Junio C Hamano
2016-01-25 21:52 ` Junio C Hamano
2016-01-27 15:16 ` Clemens Buchacher
2016-01-27 19:05 ` Junio C Hamano
2016-01-27 20:49 ` Junio C Hamano
2016-01-28 7:10 ` Clemens Buchacher
2016-01-28 21:32 ` Junio C Hamano
2016-01-30 8:13 ` Clemens Buchacher
2016-02-01 18:17 ` Junio C Hamano
2016-02-01 19:33 ` Clemens Buchacher
2016-02-02 23:14 ` Junio C Hamano
2016-02-03 8:31 ` Junio C Hamano
2016-02-01 20:26 ` Torsten Bögershausen [this message]
2016-01-28 6:20 ` eol round trip Was: [PATCH] travis-ci: run previously failed Torsten Bögershausen
2016-01-25 22:41 ` [PATCH] travis-ci: run previously failed tests first, then slowest to fastest Thomas Gummerer
2016-01-20 1:53 ` Jeff King
2016-01-20 9:10 ` Lars Schneider
2016-01-19 20:00 ` Junio C Hamano
2016-01-19 22:53 ` Junio C Hamano
2016-01-19 23:06 ` Jeff King
2016-01-19 23:26 ` Junio C Hamano
2016-01-19 23:29 ` Jeff King
2016-01-19 23:30 ` Junio C Hamano
2016-01-19 23:27 ` Jeff King
2016-01-20 7:55 ` Johannes Schindelin
2016-01-20 9:04 ` Lars Schneider
2016-01-20 20:35 ` 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=56AFBF8E.7090809@web.de \
--to=tboegi@web.de \
--cc=drizzd@aon.at \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=larsxschneider@gmail.com \
--cc=mh@glandium.org \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
--cc=t.gummerer@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).