git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Marschall <info@daniel-marschall.de>
To: git@vger.kernel.org
Cc: "Eric Wong" <e@80x24.org>, "Torsten Bögershausen" <tboegi@web.de>
Subject: Re: git-svn bug: Output git directory has uncommitted changes
Date: Sat, 30 Oct 2021 22:52:01 +0200	[thread overview]
Message-ID: <48d96db41fbe4400b995d9e9b9e03277@daniel-marschall.de> (raw)
In-Reply-To: <20211027144111.y43o4qdp3pjp6xsh@tb-raspi4>

Am 27.10.2021 16:41, schrieb Torsten Bögershausen:
> On Tue, Oct 26, 2021 at 09:30:39PM +0200, Daniel Marschall wrote:
>> Am 26.10.2021 17:14, schrieb Torsten Bögershausen:
>> 
>> What I had in mind was the following:
>> I have files in my SVN repository which are CRLF, and some files are 
>> LF.
>> I wanted to tell GIT which line ending the files should have
>> so that they will have the exact same line endings after the repo is 
>> checked
>> out. I think text=auto will also do this, maybe I should try that.
>> 
>> The "AFS" files are very special, though. Due to compatibility 
>> reasons, they
>> must be in the ancient Macintosh format (CR) otherwise the program 
>> won't
>> work. Do I need to state "eol=cr" then? Or will GIT automatically use 
>> the
>> same line endings as in the files which I have added to SVN?
> 
> Git will not change files with CR as line ending:
> When there is neither a LF nor CRLF; then the file is "not text".
> 
> git ls-files --eol  | grep "^i/-text"
> 
> Will list png, afs and some other.
> You can remove the eol=cr (it doesn't do anything useful, and it is
> just confusing)

I looked at the git documentation, but I couldn't find an official 
statement
that only "lf" and "crlf" are legal values of "eol". I only found 
examples of CRLF and LF,
but I think that doesn't mean that the lack of a CR example implies that 
CR is forbidden.
Or did I miss something?

I think it would be great if "eol=cr" could be implemented.
If you have a legacy Mac OS9 project or a project that requires files in 
a
legacy text format, then I think it would be nice if Git could be able 
to diff these
CR-text-files. If I treat them as binary, I think there can't be a
text-like diff?

> 
> Better would be:
> *.afs -text
> or
> *.afs binary
> 
> I leave it to the reader, to find out what the difference is.

I thought a long time about it, but I can't figure it out.
Google can't help me either, because "-text" is will be treated as an 
exclusion in the search term.

Can you please tell me what the difference is?
I have the theory that "binary" tells Git to handle it binary, while 
"-text" tells Git to handle it neither as binary nor as text 
("undefined")?


      reply	other threads:[~2021-10-30 20:52 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-24 20:11 git-svn bug: Output git directory has uncommitted changes Daniel Marschall
2021-10-25  9:41 ` Eric Wong
2021-10-26 15:14   ` Torsten Bögershausen
2021-10-26 19:30     ` Daniel Marschall
2021-10-27 14:41       ` Torsten Bögershausen
2021-10-30 20:52         ` Daniel Marschall [this message]

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=48d96db41fbe4400b995d9e9b9e03277@daniel-marschall.de \
    --to=info@daniel-marschall.de \
    --cc=e@80x24.org \
    --cc=git@vger.kernel.org \
    --cc=tboegi@web.de \
    /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).