git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dmitry Potapov <dpotapov@gmail.com>
To: Jakub Narebski <jnareb@gmail.com>
Cc: Finn Arne Gangstad <finnag@pvv.org>,
	git@vger.kernel.org, msysgit@googlegroups.com,
	Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>,
	Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH/RFC] autocrlf: Make it work also for un-normalized repositories
Date: Tue, 11 May 2010 01:17:39 +0400	[thread overview]
Message-ID: <20100510211739.GI14069@dpotapov.dyndns.org> (raw)
In-Reply-To: <m37hnbec16.fsf@localhost.localdomain>

On Mon, May 10, 2010 at 01:30:22PM -0700, Jakub Narebski wrote:
> Finn Arne Gangstad <finnag@pvv.org> writes:
> > 
> > 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'?

safecrlf is about making sure that you will get back exactly same file
on the next checkout as you have now in your working directory unless
you change your autocrlf value. So, the statement about breaking any
file with CR is certainly not correct.

This feature is about preserving CRLF in files inside of the repository
that were committed with CRLF despite that your current settings that
suggests that those files should be committed with LF. This makes sense
for the "guess" case, but it is clearly wrong when the user explicitly
mandated CRLF conversion for that file through attributes.


Dmitry

  reply	other threads:[~2010-05-10 21:17 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
2010-05-10 21:17   ` Dmitry Potapov [this message]
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=20100510211739.GI14069@dpotapov.dyndns.org \
    --to=dpotapov@gmail.com \
    --cc=eyvind.bernhardsen@gmail.com \
    --cc=finnag@pvv.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jnareb@gmail.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).