天天看點

IDEA中you are about to commit crlf line separators to the git repository

在IDEA中commit的時候,會遇到這個警告。

其實隻需将右下角為CRLF的檔案換為LF就行了。

詳細的關于這方面的,有一篇文章非常好:

原文連結

目錄:

什麼是CRLF和LF

為什麼要探究CRLF和LF

三種方式處理的不同

更多

參考文獻

1、什麼是CRLF和LF

CRLF 是carriagereturnline feed的縮寫。中文意思是回車換行。

LF是line feed的縮寫,中文意思是換行。

2、為什麼要探究CRLF和LF

在學習git軟體,安裝git到configuring the lien ending conversion時,有三個選項。

a. Checkout Windows-style,commit Unix-style line endings.

b.Checkout as-is,commit Unix-style line endings.

c.Checkout as-is,commit as-is line endings.

這裡面講到了做兩個操作(Checkout,Commit)的三種處理line endings的操作(Windows-style,Unix-style,As-is)。

為什麼會出現這三種處理line endings(行尾結束符)呢?在Git的幫助頁面給出了很好的解釋。

Reference From:https://help.github.com/articles/dealing-with-line-endings

If you're using Git to collaborate with others on GitHub, ensure that Git isproperly configured to handle line endings.

Every time you press return on your keyboard you're actuallyinserting an invisible character called aline ending. Historically, differentoperating systems have handled line endings differently.

When you view changes in a file, Git handles line endings in its own way.Since you're collaborating on projects with Git and GitHub, Git mightproduce unexpected results if, for example, you're working on a Windows machine,and your collaborator has made a change in OS X.

意思很好了解,就不翻譯了。重視由于曆史的原因,各種不同的作業系統在處理行尾結束符采取了不同的處理方法。而Git和GitHub

3、三種方式處理的不同

CRLF->Windows-style

LF->Unix Style

CR->Mac Style

CRLF表示句尾使用回車換行兩個字元(即我們常在Windows程式設計時使用"\r\n"換行)

LF表示表示句尾,隻使用換行.

CR表示隻使用回車.

4、在Git中如何轉換?

在Git通過下面的指令配置

$git config --global core.autocrlf true

# Configure Git on Windows to properly handle line endings

解釋:core.autocrlf是git中負責處理line endings的變量,可以設定三個值--true,inout,false.

設定成三個值會有什麼效果呢?

If core.autocrlf is set to true, that means that any time you add a file to the git repo that git thinks is a text file, it will turn all CRLF line endings to just LF before it stores it in the commit.。

設定為true,添加檔案到git倉庫時,git将其視為文本檔案。他将把crlf變成lf。【2】

If core.autocrlf is set to false, no line-ending conversion is ever performed, so text files are checked in as-is. This usually works ok。【2】

設定為false時,line-endings将不做轉換操作。文本檔案保持原來的樣子。

設定為input時,添加檔案git倉庫石,git把crlf程式設計lf。當有人Check代碼時還是lf方式。是以在window作業系統下,不要使用這個設定。

這是參考文獻2給的解釋希望能幫助大家。

Yet another way to show howautocrlf works

1) true: x -> LF -> CRLF

2) input: x -> LF -> LF

3) false: x -> x -> x

where x is either CRLF (windows-style) or LF (unix-style) and arrows stand for

file to commit -> repository -> checked out file

更多:

更為複雜的配置指令見網站:https://www.kernel.org/pub/software/scm/git/docs/git-config.html

關于LF和CRLF讨論見:http://stackoverflow.com/questions/1967370/git-replacing-lf-with-crlf

You can also provide a special--global flag, which makes Git usethe same settings for line endings acrossevery local Git repository on your computer.