From: Jakub Narebski <jnareb@gmail.com>
To: Finn Arne Gangstad <finnag@pvv.org>
Cc: git@vger.kernel.org, msysgit@googlegroups.com,
Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Dmitry Potapov <dpotapov@gmail.com>
Subject: Re: [PATCH/RFC] autocrlf: Make it work also for un-normalized repositories
Date: Mon, 10 May 2010 13:30:22 -0700 (PDT) [thread overview]
Message-ID: <m37hnbec16.fsf@localhost.localdomain> (raw)
In-Reply-To: <20100510171119.GA17875@pvv.org>
Finn Arne Gangstad <finnag@pvv.org> writes:
> 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 comit (nothing to commit)
>
> Previously this would break for any text file containing a CR
How this feature relates to `core.safecrfl'?
--
Jakub Narebski
Poland
ShadeHawk on #git
next prev parent reply other threads:[~2010-05-10 20:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-10 17:11 [PATCH/RFC] autocrlf: Make it work also for un-normalized repositories Finn Arne Gangstad
2010-05-10 17:29 ` [msysGit] " Johannes Schindelin
2010-05-10 18:48 ` Junio C Hamano
2010-05-11 22:28 ` Finn Arne Gangstad
2010-05-10 19:09 ` Eyvind Bernhardsen
2010-05-10 19:43 ` Dmitry Potapov
2010-05-11 16:31 ` Eyvind Bernhardsen
2010-05-10 20:30 ` Jakub Narebski [this message]
2010-05-10 21:17 ` Dmitry Potapov
2010-05-11 22:52 ` Finn Arne Gangstad
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=m37hnbec16.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=dpotapov@gmail.com \
--cc=eyvind.bernhardsen@gmail.com \
--cc=finnag@pvv.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=msysgit@googlegroups.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).