转换整个目录树的行结尾 (Git)

发布于 2024-11-29 13:09:47 字数 426 浏览 1 评论 0原文

以下情况:

我正在运行 OS X 的 Mac 上工作,最近加入了一个项目,该项目迄今为止的成员都使用 Windows。我的首要任务之一是在 Git 存储库中设置代码库,因此我从 FTP 中提取目录树,并尝试将其签入我在本地准备的 Git 存储库中。当尝试这样做时,我得到的只是这个

fatal: CRLF would be replaced by LF in blog/license.txt.

,因为这会影响“blog”文件夹下的所有文件,所以我正在寻找一种方法来方便地将树中的所有文件转换为 Unix 行结尾。有没有一个工具可以开箱即用,或者我自己编写一些脚本?

作为参考,我有关行结束的 Git 配置:

core.safecrlf=true
core.autocrlf=input

Following situation:

I'm working on a Mac running OS X and recently joined a project whose members so far all use Windows. One of my first tasks was to set up the codebase in a Git repository, so I pulled the directory tree from FTP and tried to check it into the Git repo I had prepared locally. When trying to do this, all I got was this

fatal: CRLF would be replaced by LF in blog/license.txt.

Since this affects all files below the "blog" folder, I'm looking for a way to conveniently convert ALL files in the tree to Unix line-endings. Is there a tool that does that out of the box or do I get scripting something myself?

For reference, my Git config concerning line-endings:

core.safecrlf=true
core.autocrlf=input

如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。

扫码二维码加入Web技术交流群

发布评论

需要 登录 才能够评论, 你可以免费 注册 一个本站的账号。

评论(8

栀梦 2024-12-06 13:09:47

dos2unix 会为你做到这一点。相当简单的过程。

dos2unix filename

感谢 toolbear,这里有一个单行代码,可以递归地替换行结尾并正确处理空格、引号和 shell 元字符。

find . -type f -exec dos2unix {} \;

如果您使用 dos2unix 6.0,二进制文件将被忽略。

dos2unix does that for you. Fairly straight forward process.

dos2unix filename

Thanks to toolbear, here is a one-liner that recursively replaces line endings and properly handles whitespace, quotes, and shell meta chars.

find . -type f -exec dos2unix {} \;

If you're using dos2unix 6.0 binary files will be ignored.

李不 2024-12-06 13:09:47

假设您有 GNU grep 和 perl 这将在当前目录下的非二进制文件中递归地将 CRLF 转换为 LF:

find . -type f -exec grep -qIP '\r\n' {} ';' -exec perl -pi -e 's/\r\n/\n/g' {} '+'

它是如何工作的

在当前目录下递归查找;将 . 更改为 blogwhatev 子目录以限制替换:

find .

仅匹配常规文件:

  -type f

测试文件是否包含 CRLF。排除二进制文件。为每个常规文件运行 grep 命令。这就是排除二进制文件的代价。如果您有旧的 grep,您可以尝试使用 file 命令构建测试:

  -exec grep -qIP '\r\n' {} ';'

将 CRLF 替换为 LF。带有第二个 -exec'+' 告诉 find 累积匹配的文件并将它们传递给一次(或尽可能少的)调用该命令——类似于通过管道传输到 xargs,但如果文件路径包含空格、引号或其他 shell 元字符,则不会出现问题。 -pi 中的 i 告诉 perl 就地修改文件。您可以在此处使用 sedawk 进行一些工作,并且您可能会将 '+' 更改为 ';'并为每场比赛调用一个单独的过程:

  -exec perl -pi -e 's/\r\n/\n/g' {} '+'

Assuming you have GNU grep and perl this will recursively convert CRLF to LF in non-binary files under the current directory:

find . -type f -exec grep -qIP '\r\n' {} ';' -exec perl -pi -e 's/\r\n/\n/g' {} '+'

How it Works

Find recursively under current directory; change . to blog or whatev subdirectories to limit the replacement:

find .

Only match regular files:

  -type f

Test if file contains CRLF. Exclude binary files. Runs grep command for every regular file. That's the price of excluding binaries. If you have an old grep you could try building a test using the file command:

  -exec grep -qIP '\r\n' {} ';'

Replace CRLF with LF. The '+' with the second -exec tells find to accumulate matching files and pass them to one (or as few as possible) invocations of the command -- like piping to xargs, but without problems if file path contains spaces, quotes, or other shell meta characters. The i in -pi tells perl to modify the file in place. You could use sed or awk here with some work, and you'll probably change '+' to ';' and invoke a separate process for each match:

  -exec perl -pi -e 's/\r\n/\n/g' {} '+'
年少掌心 2024-12-06 13:09:47

这是一个更好的选择:瑞士锉刀。它在子目录中递归地工作,并正确处理空格和特殊字符。

您所要做的就是:

sfk remcr -dir your_project_directory

额外奖励:sfk 还可以进行许多其他转换。请参阅下面的完整列表:

SFK - The Swiss File Knife File Tree Processor.
Release 1.6.7 Base Revision 2 of May  3 2013.
StahlWorks Technologies, http://stahlworks.com/
Distributed for free under the BSD License, without any warranty.

type "sfk commandname" for help on any of the following.
some commands require to add "-help" for the help text.

   file system
      sfk list       - list directory tree contents.
                       list latest, oldest or biggest files.
                       list directory differences.
                       list zip jar tar gz bz2 contents.
      sfk filefind   - find files by filename
      sfk treesize   - show directory size statistics
      sfk copy       - copy directory trees additively
      sfk sync       - mirror tree content with deletion
      sfk partcopy   - copy part from a file into another one
      sfk mkdir      - create directory tree
      sfk delete     - delete files and folders
      sfk deltree    - delete whole directory tree
      sfk deblank    - remove blanks in filenames
      sfk space [-h] - tell total and free size of volume
      sfk filetime   - tell times of a file
      sfk touch      - change times of a file

   conversion
      sfk lf-to-crlf - convert from LF to CRLF line endings
      sfk crlf-to-lf - convert from CRLF to LF line endings
      sfk detab      - convert TAB characters to spaces
      sfk entab      - convert groups of spaces to TAB chars
      sfk scantab    - list files containing TAB characters
      sfk split      - split large files into smaller ones
      sfk join       - join small files into a large one
      sfk hexdump    - create hexdump from a binary file
      sfk hextobin   - convert hex data to binary
      sfk hex        - convert decimal number(s) to hex
      sfk dec        - convert hex number(s) to decimal
      sfk chars      - print chars for a list of codes
      sfk bin-to-src - convert binary to source code

   text processing
      sfk filter     - search, filter and replace text data
      sfk addhead    - insert string at start of text lines
      sfk addtail    - append string at end of text lines
      sfk patch      - change text files through a script
      sfk snapto     - join many text files into one file
      sfk joinlines  - join text lines split by email reformatting
      sfk inst       - instrument c++ sourcecode with tracing calls
      sfk replace    - replace words in binary and text files
      sfk hexfind    - find words in binary files, showing hexdump
      sfk run        - run command on all files of a folder
      sfk runloop    - run a command n times in a loop
      sfk printloop  - print some text many times
      sfk strings    - extract strings from a binary file
      sfk sort       - sort text lines produced by another command
      sfk count      - count text lines, filter identical lines
      sfk head       - print first lines of a file
      sfk tail       - print last lines of a file
      sfk linelen    - tell length of string(s)

   search and compare
      sfk find       - find words in binary files, showing text
      sfk md5gento   - create list of md5 checksums over files
      sfk md5check   - verify list of md5 checksums over files
      sfk md5        - calc md5 over a file, compare two files
      sfk pathfind   - search PATH for location of a command
      sfk reflist    - list fuzzy references between files
      sfk deplist    - list fuzzy dependencies between files
      sfk dupfind    - find duplicate files by content

   networking
      sfk httpserv   - run an instant HTTP server.
                       type "sfk httpserv -help" for help.
      sfk ftpserv    - run an instant FTP server
                       type "sfk ftpserv -help" for help.
      sfk ftp        - instant anonymous FTP client
      sfk wget       - download HTTP file from the web
      sfk webrequest - send HTTP request to a server
      sfk tcpdump    - print TCP conversation between programs
      sfk udpdump    - print incoming UDP requests
      sfk udpsend    - send UDP requests
      sfk ip         - tell own machine's IP address(es).
                       type "sfk ip -help" for help.
      sfk netlog     - send text outputs to network,
                       and/or file, and/or terminal

   scripting
      sfk script     - run many sfk commands in a script file
      sfk echo       - print (coloured) text to terminal
      sfk color      - change text color of terminal
      sfk alias      - create command from other commands
      sfk mkcd       - create command to reenter directory
      sfk sleep      - delay execution for milliseconds
      sfk pause      - wait for user input
      sfk label      - define starting point for a script
      sfk tee        - split command output in two streams
      sfk tofile     - save command output to a file
      sfk toterm     - flush command output to terminal
      sfk loop       - repeat execution of a command chain
      sfk cd         - change directory within a script
      sfk getcwd     - print the current working directory
      sfk require    - compare version text

   development
      sfk bin-to-src - convert binary data to source code
      sfk make-random-file - create file with random data
      sfk fuzz       - change file at random, for testing
      sfk sample     - print example code for programming
      sfk inst       - instrument c++ with tracing calls

   diverse
      sfk media      - cut video and binary files
      sfk view       - show results in a GUI tool
      sfk toclip     - copy command output to clipboard
      sfk fromclip   - read text from clipboard
      sfk list       - show directory tree contents
      sfk env        - search environment variables
      sfk version    - show version of a binary file
      sfk ascii      - list ISO 8859-1 ASCII characters
      sfk ascii -dos - list OEM codepage 850 characters
      sfk license    - print the SFK license text

   help by subject
      sfk help select   - how dirs and files are selected in sfk
      sfk help options  - general options reference
      sfk help patterns - wildcards and text patterns within sfk
      sfk help chain    - how to combine (chain) multiple commands
      sfk help shell    - how to optimize the windows command prompt
      sfk help unicode  - about unicode file reading support
      sfk help colors   - how to change result colors
      sfk help xe       - for infos on sfk extended edition.

   All tree walking commands support file selection this way:

   1. short format with ONE directory tree and MANY file name patterns:
      src1dir .cpp .hpp .xml bigbar !footmp
   2. short format with a list of explicite file names:
      letter1.txt revenues9.xls report3\turnover5.ppt
   3. long format with MANY dir trees and file masks PER dir tree:
      -dir src1 src2 !src\save -file foosys .cpp -dir bin5 -file .exe

   For detailed help on file selection, type "sfk help select".

   * and ? wildcards are supported within filenames. "foo" is interpreted
   as "*foo*", so you can leave out * completely to search a part of a name.
   For name start comparison, say "\foo" (finds foo.txt but not anyfoo.txt).

   When you supply a directory name, by default this means "take all files".

      sfk list mydir                lists ALL  files of mydir, no * needed.
      sfk list mydir .cpp .hpp      lists SOME files of mydir, by extension.
      sfk list mydir !.cfg          lists all  files of mydir  EXCEPT .cfg

   general options:
      -tracesel tells in detail which files and/or directories are included
                or excluded, and why (due to which user-supplied mask).
      -nosub    do not process files within subdirectories.
      -nocol    before any command switches off color output.
      -quiet    or -nohead shows less output on some commands.
      -hidden   includes hidden and system files and dirs.
      For detailed help on all options, type "sfk help options".

   beware of Shell Command Characters.
      command parameters containing characters < > | ! & must be sur-
      rounded by quotes "". type "sfk filter" for details and examples.

   type "sfk ask word1 word2 ..."   to search ALL help text for words.
   type "sfk dumphelp"              to print  ALL help text.

编辑:警告:在包含二进制文件的文件夹上运行此命令时要小心,因为它会有效地破坏您的文件,特别是 .git 目录。如果是这种情况,请不要在整个文件夹中运行 sfk,而是选择特定的文件扩展名(*.rb、*.py 等)。示例:sfk remcr -dir Chef -file .rb -file .json -file .erb -file .md

Here's a better option: Swiss File Knife. It works recursively across sub-directories, and handles properly spaces and special characters.

All you have to do is:

sfk remcr -dir your_project_directory

Bonus: sfk also does lots of other conversions. See below for the full list:

SFK - The Swiss File Knife File Tree Processor.
Release 1.6.7 Base Revision 2 of May  3 2013.
StahlWorks Technologies, http://stahlworks.com/
Distributed for free under the BSD License, without any warranty.

type "sfk commandname" for help on any of the following.
some commands require to add "-help" for the help text.

   file system
      sfk list       - list directory tree contents.
                       list latest, oldest or biggest files.
                       list directory differences.
                       list zip jar tar gz bz2 contents.
      sfk filefind   - find files by filename
      sfk treesize   - show directory size statistics
      sfk copy       - copy directory trees additively
      sfk sync       - mirror tree content with deletion
      sfk partcopy   - copy part from a file into another one
      sfk mkdir      - create directory tree
      sfk delete     - delete files and folders
      sfk deltree    - delete whole directory tree
      sfk deblank    - remove blanks in filenames
      sfk space [-h] - tell total and free size of volume
      sfk filetime   - tell times of a file
      sfk touch      - change times of a file

   conversion
      sfk lf-to-crlf - convert from LF to CRLF line endings
      sfk crlf-to-lf - convert from CRLF to LF line endings
      sfk detab      - convert TAB characters to spaces
      sfk entab      - convert groups of spaces to TAB chars
      sfk scantab    - list files containing TAB characters
      sfk split      - split large files into smaller ones
      sfk join       - join small files into a large one
      sfk hexdump    - create hexdump from a binary file
      sfk hextobin   - convert hex data to binary
      sfk hex        - convert decimal number(s) to hex
      sfk dec        - convert hex number(s) to decimal
      sfk chars      - print chars for a list of codes
      sfk bin-to-src - convert binary to source code

   text processing
      sfk filter     - search, filter and replace text data
      sfk addhead    - insert string at start of text lines
      sfk addtail    - append string at end of text lines
      sfk patch      - change text files through a script
      sfk snapto     - join many text files into one file
      sfk joinlines  - join text lines split by email reformatting
      sfk inst       - instrument c++ sourcecode with tracing calls
      sfk replace    - replace words in binary and text files
      sfk hexfind    - find words in binary files, showing hexdump
      sfk run        - run command on all files of a folder
      sfk runloop    - run a command n times in a loop
      sfk printloop  - print some text many times
      sfk strings    - extract strings from a binary file
      sfk sort       - sort text lines produced by another command
      sfk count      - count text lines, filter identical lines
      sfk head       - print first lines of a file
      sfk tail       - print last lines of a file
      sfk linelen    - tell length of string(s)

   search and compare
      sfk find       - find words in binary files, showing text
      sfk md5gento   - create list of md5 checksums over files
      sfk md5check   - verify list of md5 checksums over files
      sfk md5        - calc md5 over a file, compare two files
      sfk pathfind   - search PATH for location of a command
      sfk reflist    - list fuzzy references between files
      sfk deplist    - list fuzzy dependencies between files
      sfk dupfind    - find duplicate files by content

   networking
      sfk httpserv   - run an instant HTTP server.
                       type "sfk httpserv -help" for help.
      sfk ftpserv    - run an instant FTP server
                       type "sfk ftpserv -help" for help.
      sfk ftp        - instant anonymous FTP client
      sfk wget       - download HTTP file from the web
      sfk webrequest - send HTTP request to a server
      sfk tcpdump    - print TCP conversation between programs
      sfk udpdump    - print incoming UDP requests
      sfk udpsend    - send UDP requests
      sfk ip         - tell own machine's IP address(es).
                       type "sfk ip -help" for help.
      sfk netlog     - send text outputs to network,
                       and/or file, and/or terminal

   scripting
      sfk script     - run many sfk commands in a script file
      sfk echo       - print (coloured) text to terminal
      sfk color      - change text color of terminal
      sfk alias      - create command from other commands
      sfk mkcd       - create command to reenter directory
      sfk sleep      - delay execution for milliseconds
      sfk pause      - wait for user input
      sfk label      - define starting point for a script
      sfk tee        - split command output in two streams
      sfk tofile     - save command output to a file
      sfk toterm     - flush command output to terminal
      sfk loop       - repeat execution of a command chain
      sfk cd         - change directory within a script
      sfk getcwd     - print the current working directory
      sfk require    - compare version text

   development
      sfk bin-to-src - convert binary data to source code
      sfk make-random-file - create file with random data
      sfk fuzz       - change file at random, for testing
      sfk sample     - print example code for programming
      sfk inst       - instrument c++ with tracing calls

   diverse
      sfk media      - cut video and binary files
      sfk view       - show results in a GUI tool
      sfk toclip     - copy command output to clipboard
      sfk fromclip   - read text from clipboard
      sfk list       - show directory tree contents
      sfk env        - search environment variables
      sfk version    - show version of a binary file
      sfk ascii      - list ISO 8859-1 ASCII characters
      sfk ascii -dos - list OEM codepage 850 characters
      sfk license    - print the SFK license text

   help by subject
      sfk help select   - how dirs and files are selected in sfk
      sfk help options  - general options reference
      sfk help patterns - wildcards and text patterns within sfk
      sfk help chain    - how to combine (chain) multiple commands
      sfk help shell    - how to optimize the windows command prompt
      sfk help unicode  - about unicode file reading support
      sfk help colors   - how to change result colors
      sfk help xe       - for infos on sfk extended edition.

   All tree walking commands support file selection this way:

   1. short format with ONE directory tree and MANY file name patterns:
      src1dir .cpp .hpp .xml bigbar !footmp
   2. short format with a list of explicite file names:
      letter1.txt revenues9.xls report3\turnover5.ppt
   3. long format with MANY dir trees and file masks PER dir tree:
      -dir src1 src2 !src\save -file foosys .cpp -dir bin5 -file .exe

   For detailed help on file selection, type "sfk help select".

   * and ? wildcards are supported within filenames. "foo" is interpreted
   as "*foo*", so you can leave out * completely to search a part of a name.
   For name start comparison, say "\foo" (finds foo.txt but not anyfoo.txt).

   When you supply a directory name, by default this means "take all files".

      sfk list mydir                lists ALL  files of mydir, no * needed.
      sfk list mydir .cpp .hpp      lists SOME files of mydir, by extension.
      sfk list mydir !.cfg          lists all  files of mydir  EXCEPT .cfg

   general options:
      -tracesel tells in detail which files and/or directories are included
                or excluded, and why (due to which user-supplied mask).
      -nosub    do not process files within subdirectories.
      -nocol    before any command switches off color output.
      -quiet    or -nohead shows less output on some commands.
      -hidden   includes hidden and system files and dirs.
      For detailed help on all options, type "sfk help options".

   beware of Shell Command Characters.
      command parameters containing characters < > | ! & must be sur-
      rounded by quotes "". type "sfk filter" for details and examples.

   type "sfk ask word1 word2 ..."   to search ALL help text for words.
   type "sfk dumphelp"              to print  ALL help text.

EDIT: a word of caution: be careful when running this on folders that have binary files, as it will effectively destroy your files, particularly .git directories. If this is your case, do not run sfk in the entire folder, but select specific file extensions instead (*.rb, *.py, etc). Example: sfk remcr -dir chef -file .rb -file .json -file .erb -file .md

淡淡の花香 2024-12-06 13:09:47
find . -not \( -name .svn -prune -o -name .git -prune \) -type f -exec perl -pi -e 's/\r\n|\n|\r/\n/g' {} \;

这更安全,因为它可以避免损坏您的 git 存储库。将 .git、.svn 添加或替换为 .bzr、.hg 或您使用的任何源代码控制到列表。

find . -not \( -name .svn -prune -o -name .git -prune \) -type f -exec perl -pi -e 's/\r\n|\n|\r/\n/g' {} \;

This is much safer as it avoids corrupting your git repo. Add or replace .git, .svn with .bzr, .hg or whatever source control your using to the not list.

我们只是彼此的过ke 2024-12-06 13:09:47

在 OS X 上,这对我有用:

find ./ -type f -exec perl -pi -e 's/\r\n|\n|\r/\n/g' {} \;

警告:请在执行此命令之前备份您的目录。

On OS X, this worked for me:

find ./ -type f -exec perl -pi -e 's/\r\n|\n|\r/\n/g' {} \;

Warning: Please backup your directory before executing this command.

时光病人 2024-12-06 13:09:47

当前接受的答案使用 find -execdos2unix 但现在这是不必要的,因为绝大多数 shell,包括 Bash,都支持使用通配符对所有文件进行操作在目录中(称为路径名扩展通配)。

不使用 dos2unix 的答案甚至更糟糕,因为它们进行幼稚的搜索和替换,这将不可逆转地损坏二进制文件,例如可执行文件、图像和视频,甚至 的内容。 git 目录。

dos2unixunix2dos 都是无处不在的轻量级工具,它们已预安装在我使用过的每个基于 UNIX 的系统上,这意味着它们几乎肯定已经安装在你的系统。默认情况下,它们还会跳过非文本文件,从而使它们可以安全地以这种方式在整个目录上使用,这与其他答案不同。

将所有行结尾转换为 UNIX 行结尾 (LF)

dos2unix -v *

将所有行结尾转换为 Windows 行结尾 (CRLF)

unix2dos -v * 

不需要 -v/--verbose 开关但会将正在转换的文件输出到控制台。

The current accepted answer uses find -exec with dos2unix but this is unnecessary nowadays because the vast majority of shells, including Bash, support the use of a wildcard to operate on all files in a directory (known as pathname expansion or globbing).

The answers that don't use dos2unix are even worse because they do naive search-and-replaces that will irreversibly corrupt binary files like executables, images and videos, and even the contents of the .git directory.

Both dos2unix and unix2dos are ubiquitous, lightweight tools that have been pre-installed on every UNIX-based system I've ever used, meaning they're almost definitely already installed on your system. They also skip non-text files by default, making them safe to use on entire directories in this way unlike other answers.

To convert all line endings to UNIX line endings (LF)

dos2unix -v *

To convert all line endings to Windows line endings (CRLF)

unix2dos -v * 

The -v/--verbose switch isn't required but will output which files are being converted to the console.

垂暮老矣 2024-12-06 13:09:47
 find ./ -type f -name "*.java" -exec perl -pi -e 's/\r\n|\n|\r/\n/g' {} \;

这对我在 wsl2 上有用,将所有 java 文件从 CRLF 更改为 LF

 find ./ -type f -name "*.java" -exec perl -pi -e 's/\r\n|\n|\r/\n/g' {} \;

This has worked for me on wsl2 to change all the java files from CRLF to LF

摘星┃星的人 2024-12-06 13:09:47

和其他的一样,但是用的是node.js

find ./src/test/resources/com/sonalake/bss/tests/bdd/ -type f -exec node -e "require('fs'); const val = fs.readFileSync(process.argv[1], 'utf8'); fs.writeFileSync(process.argv[1], val.replace(/\r\n/g, '\n'))" {} ';'
// load file system module
require('fs');
// read file
const val = fs.readFileSync(process.argv[1], 'utf8');
// replace file contents
fs.writeFileSync(process.argv[1], val.replace(/\r\n/g, '\n'))

The same as the others but with node.js

find ./src/test/resources/com/sonalake/bss/tests/bdd/ -type f -exec node -e "require('fs'); const val = fs.readFileSync(process.argv[1], 'utf8'); fs.writeFileSync(process.argv[1], val.replace(/\r\n/g, '\n'))" {} ';'
// load file system module
require('fs');
// read file
const val = fs.readFileSync(process.argv[1], 'utf8');
// replace file contents
fs.writeFileSync(process.argv[1], val.replace(/\r\n/g, '\n'))
~没有更多了~
我们使用 Cookies 和其他技术来定制您的体验包括您的登录状态等。通过阅读我们的 隐私政策 了解更多相关信息。 单击 接受 或继续使用网站,即表示您同意使用 Cookies 和您的相关数据。
原文