Git 存储库在克隆后立即发生更改

Question

克隆此存储库后：

\n\n

https://github.com/OpenFOAM/OpenFOAM-3.0.x

\n\n

我立即提交了更改。\n我尝试使用更改文件的常见解决方案来textmode修复crlfauto它./git/config。我也尝试过该.gitattributes文件。但是，这不是行结尾问题。我对代码进行了实际更改。

\n\n

这是我的过程和输出：

\n\n

cruz@MacBook-Air-de-Luis \xee\x82\xb0 ~/dev \xee\x82\xb0 git clone https://github.com/luiscruz/OpenFOAM-3.0.x.git\nCloning into \'OpenFOAM-3.0.x\'...\nremote: Counting objects: 49097, done.\nremote: Total 49097 (delta 0), reused 0 (delta 0), pack-reused 49097\nReceiving objects: 100% (49097/49097), 59.70 MiB | 2.29 MiB/s, done.\nResolving deltas: 100% (30768/30768), done.\nChecking connectivity... done.\nChecking out files: 100% (13863/13863), done.\n cruz@MacBook-Air-de-Luis \xee\x82\xb0 ~/dev \xee\x82\xb0 cd OpenFOAM-3.0.x\n cruz@MacBook-Air-de-Luis \xee\x82\xb0 ~/dev/OpenFOAM-3.0.x \xee\x82\xb0 \xee\x82\xa0 master \xe2\x97\x8f \xee\x82\xb0 git status\nOn branch master\nYour branch is up-to-date with \'origin/master\'.\nChanges not staged for commit:\n  (use "git add <file>..." to update what will be committed)\n  (use "git checkout -- <file>..." to discard changes in working directory)\n\n    modified:   applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C\n    modified:   applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H\n    modified:   applications/test/Dictionary/Make/files\n    modified:   applications/test/Dictionary/Make/options\n    modified:   applications/test/Dictionary/Test-Dictionary.C\n    modified:   src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H\n    modified:   src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H\n    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C\n    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H\n    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C\n    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C\n    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C\n    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C\n    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C\n    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C\n    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C\n    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H\n    modified:   src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.C\n    modified:   src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H\n    modified:   src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.C\n    modified:   src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H\n    modified:   src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.C\n    modified:   src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H\n    modified:   src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C\n    modified:   src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.H\n    modified:   src/OpenFOAM/meshes/MeshObject/MeshObject.C\n    modified:   src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H\n    modified:   src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H\n    modified:   src/OpenFOAM/meshes/primitiveShapes/objectHit/PointIndexHit.H\n    modified:   src/finiteVolume/finiteVolume/fvc/fvcDDt.C\n    modified:   src/finiteVolume/finiteVolume/fvc/fvcDDt.H\n    modified:   src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C\n    modified:   src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H\n    modified:   src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrads.C\n    modified:   src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C\n    modified:   src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.H\n    modified:   src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.C\n    modified:   src/fvOptions/sources/general/codedSource/CodedSource.C\n    modified:   src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C\n    modified:   tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/B\n\nno changes added to commit (use "git add" and/or "git commit -a")\n cruz@MacBook-Air-de-Luis \xee\x82\xb0 ~/dev/OpenFOAM-3.0.x \xee\x82\xb0 \xee\x82\xa0 master \xe2\x97\x8f \xee\x82\xb0\n

\n\n

我什至尝试提交这些更改，但它不起作用。

\n\n

git version 2.10.1\nMac OS X 10.10.5

\n\n

我的git配置：

\n\n

git config -l\ncore.excludesfile=~/.gitignore\ncore.legacyheaders=false\ncore.quotepath=false\ncore.pager=less\nmergetool.keepbackup=true\npush.default=simple\ncolor.ui=auto\ncolor.interactive=auto\nrepack.usedeltabaseoffset=true\nalias.s=status\nalias.a=!git add . && git status\nalias.au=!git add -u . && git status\nalias.aa=!git add . && git add -u . && git status\nalias.c=commit\nalias.cm=commit -m\nalias.ca=commit --amend\nalias.ac=!git add . && git commit\nalias.acm=!git add . && git commit -m\nalias.l=log --graph --all --pretty=format:\'%C(yellow)%h%C(cyan)%d%Creset %s %C(white)- %an, %ar%Creset\'\nalias.ll=log --stat --abbrev-commit\nalias.lg=log --color --graph --pretty=format:\'%C(bold white)%h%Creset -%C(bold green)%d%Creset %s %C(bold green)(%cr)%Creset %C(bold blue)<%an>%Creset\' --abbrev-commit --date=relative\nalias.llg=log --color --graph --pretty=format:\'%C(bold white)%H %d%Creset%n%s%n%+b%C(bold blue)%an <%ae>%Creset %C(bold green)%cr (%ci)\' --abbrev-commit\nalias.d=diff\nalias.master=checkout master\nalias.spull=svn rebase\nalias.spush=svn dcommit\nalias.alias=!git config --list | grep \'alias\\.\' | sed \'s/alias\\.\\([^=]*\\)=\\(.*\\)/\\1\\     => \\2/\' | sort\ninclude.path=~/.gitcinclude\ninclude.path=.githubconfig\ninclude.path=.gitcredential\ndiff.exif.textconv=exif\ncredential.helper=osxkeychain\nuser.name=Luis Cruz\nuser.email=luismirandacruz@gmail.com\ncredential.helper=osxkeychain\npush.default=simple\ncore.repositoryformatversion=0\ncore.filemode=false\ncore.bare=false\ncore.logallrefupdates=true\ncore.ignorecase=true\ncore.precomposeunicode=true\ncore.autocrlf=true\nremote.origin.url=https://github.com/luiscruz/OpenFOAM-3.0.x.git\nremote.origin.fetch=+refs/heads/*:refs/remotes/origin/*\nbranch.master.remote=origin\nbranch.master.merge=refs/heads/master\n

\n\n

git diff 摘录：

\n\n

-#include "InterfaceCompositionModel.H"\n+#include "interfaceCompositionModel.H"\n #include "phaseModel.H"\n #include "phasePair.H"\n-#include "pureMixture.H"\n-#include "multiComponentMixture.H"\n-#include "rhoThermo.H"\n\n-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //\n+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //\n

\n\n

我邀请您克隆该存储库：

\n\n

 git clone https://github.com/luiscruz/OpenFOAM-3.0.x.git\n

\n

Answer 1

此链接可能可以帮助您，Git 拒绝重置/丢弃文件

这主要是导致 Mac、Liunx 和 Windows 的换行不同。