Skip to contentSkip to conversation

git status internals and line endings

DISCUSSION Marc Strapetz 4 participants 6 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

I'm trying to figure out under which circumstances changes in line endings are resulting in 'modified' status (resp. will be committed). I have three files with the same content, differing only in line endings:

- file1 is committed with CRLF and has LF in working tree
- file2 is committed with CRLF and has CRLF in working tree
- file3 is committed with LF and has CRLF in working tree

On Linux, file1 and file3 are reported as modified -- as I would expect. The surprise is on Windows: here only file1 is reported as modified. Why not file3? Btw, 'git hash-object file3' reports the same SHA as for the LF-only content in the repository (not so on Linux, as expected).

Is this some special handling on Windows (and possibly on Mac OS)? In this case, can someone please point me to the corresponding code part? Thanks for any comments regarding this topic.

--
Best regards,
Marc Strapetz
=============
syntevo GmbH
http://www.syntevo.com
http://blog.syntevo.com

#1 lore raw
Quoted 8 lines · Marc Strapetz

On Linux, file1 and file3 are reported as modified -- as I would expect. The surprise is on Windows: here only file1 is reported as modified. Why not file3? Btw, 'git hash-object file3' reports the same SHA as for the LF-only content in the repository (not so on Linux, as expected).

Is this some special handling on Windows (and possibly on Mac OS)? In this case, can someone please point me to the corresponding code part? Thanks for any comments regarding this topic.

Sounds like the core.autocrlf setting (see "git help config"), which I believe is set by default on Windows.

-Peff

#2 lore raw
Quoted 2 lines

Sounds like the core.autocrlf setting (see "git help config"), which I believe is set by default on Windows.

I have checked both $GIT_DIR/config and ~/.gitconfig and autocrlf has not been set. I have then set autocrlf = false for the Windows repository and still the file didn't show up as modified. On Linux, I've added autocrlf = true (resp. autocrlf = input) for the repository and still the file shows up as modified. Not that I don't like this behavior, but I don't understand it :) Windows Git version is 1.6.5.1, Linux version is 1.6.3.3.

--
Best regards,
Marc Strapetz
=============
syntevo GmbH
http://www.syntevo.com
http://blog.syntevo.com

Quoted 21 lines · Jeff King
Quoted 8 lines · Marc Strapetz

On Linux, file1 and file3 are reported as modified -- as I would expect. The surprise is on Windows: here only file1 is reported as modified. Why not file3? Btw, 'git hash-object file3' reports the same SHA as for the LF-only content in the repository (not so on Linux, as expected).

Is this some special handling on Windows (and possibly on Mac OS)? In this case, can someone please point me to the corresponding code part? Thanks for any comments regarding this topic.

Sounds like the core.autocrlf setting (see "git help config"), which I believe is set by default on Windows.

-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw
Quoted 11 lines · Marc Strapetz
Quoted 2 lines

Sounds like the core.autocrlf setting (see "git help config"), which I believe is set by default on Windows.

I have checked both $GIT_DIR/config and ~/.gitconfig and autocrlf has not been set. I have then set autocrlf = false for the Windows repository and still the file didn't show up as modified. On Linux, I've added autocrlf = true (resp. autocrlf = input) for the repository and still the file shows up as modified. Not that I don't like this behavior, but I don't understand it :) Windows Git version is 1.6.5.1, Linux version is 1.6.3.3.

In order to make changes to core.autocrlf effective, you need to delete .git/index and perform a hard reset:

$ rm .git/index
$ git reset --hard

Did you do this before checking if the files were modified?

Signature · 1 line
Erik "kusma" Faye-Lund
#4 lore raw
Quoted 4 lines

In order to make changes to core.autocrlf effective, you need to delete .git/index and perform a hard reset:

$ rm .git/index
$ git reset --hard

This solved my problem. Thank you!

--
Best regards,
Marc Strapetz
=============
syntevo GmbH
http://www.syntevo.com
http://blog.syntevo.com

Quoted 20 lines · Erik Faye-Lund
Quoted 10 lines · Marc Strapetz
Quoted 2 lines

Sounds like the core.autocrlf setting (see "git help config"), which I believe is set by default on Windows.

I have checked both $GIT_DIR/config and ~/.gitconfig and autocrlf has not been set. I have then set autocrlf = false for the Windows repository and still the file didn't show up as modified. On Linux, I've added autocrlf = true (resp. autocrlf = input) for the repository and still the file shows up as modified. Not that I don't like this behavior, but I don't understand it :) Windows Git version is 1.6.5.1, Linux version is 1.6.3.3.

In order to make changes to core.autocrlf effective, you need to delete .git/index and perform a hard reset:

$ rm .git/index
$ git reset --hard

Did you do this before checking if the files were modified?

#5 lore raw
In reply to Marc Strapetz

Marc Strapetz:

Quoted 3 lines
Quoted 1 line

Sounds like the core.autocrlf setting (see "git help config"), which I believe is set by default on Windows.

I have checked both $GIT_DIR/config and ~/.gitconfig and autocrlf has not been set.

It is usually set by default by the installer. Look at %INSTALLDIR%\etc\gitconfig, it should contain

[core]
autoCRLF = true

among other things.

Signature · 1 line
\\// Peter - http://www.softwolves.pp.se/