克隆后 Git 仓库就发生了变化

Question

克隆后 Git 仓库就发生了变化

5

在克隆此仓库之后：https://github.com/OpenFOAM/OpenFOAM-3.0.x，我立即有了要提交的更改。我尝试使用将./git/config文件中的textmode和crlfauto更改为通用解决方案来修复它。我也尝试了.gitattributes文件。但是，这不是行尾问题。我在代码中实际上有更改。

以下是我的步骤和输出：

cruz@MacBook-Air-de-Luis  ~/dev  git clone https://github.com/luiscruz/OpenFOAM-3.0.x.git
Cloning into 'OpenFOAM-3.0.x'...
remote: Counting objects: 49097, done.
remote: Total 49097 (delta 0), reused 0 (delta 0), pack-reused 49097
Receiving objects: 100% (49097/49097), 59.70 MiB | 2.29 MiB/s, done.
Resolving deltas: 100% (30768/30768), done.
Checking connectivity... done.
Checking out files: 100% (13863/13863), done.
 cruz@MacBook-Air-de-Luis  ~/dev  cd OpenFOAM-3.0.x
 cruz@MacBook-Air-de-Luis  ~/dev/OpenFOAM-3.0.x   master ●  git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    modified:   applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C
    modified:   applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
    modified:   applications/test/Dictionary/Make/files
    modified:   applications/test/Dictionary/Make/options
    modified:   applications/test/Dictionary/Test-Dictionary.C
    modified:   src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
    modified:   src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.C
    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixPreconditioner.C
    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSmoother.C
    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.C
    modified:   src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
    modified:   src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.C
    modified:   src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H
    modified:   src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.C
    modified:   src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H
    modified:   src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.C
    modified:   src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H
    modified:   src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.C
    modified:   src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.H
    modified:   src/OpenFOAM/meshes/MeshObject/MeshObject.C
    modified:   src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
    modified:   src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H
    modified:   src/OpenFOAM/meshes/primitiveShapes/objectHit/PointIndexHit.H
    modified:   src/finiteVolume/finiteVolume/fvc/fvcDDt.C
    modified:   src/finiteVolume/finiteVolume/fvc/fvcDDt.H
    modified:   src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
    modified:   src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
    modified:   src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrads.C
    modified:   src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.C
    modified:   src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresVectors.H
    modified:   src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.C
    modified:   src/fvOptions/sources/general/codedSource/CodedSource.C
    modified:   src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
    modified:   tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/B

no changes added to commit (use "git add" and/or "git commit -a")
 cruz@MacBook-Air-de-Luis  ~/dev/OpenFOAM-3.0.x   master ● 

我甚至尝试提交这些更改，但它没有起作用。

git版本2.10.1 Mac OS X 10.10.5

我的git配置：

git config -l
core.excludesfile=~/.gitignore
core.legacyheaders=false
core.quotepath=false
core.pager=less
mergetool.keepbackup=true
push.default=simple
color.ui=auto
color.interactive=auto
repack.usedeltabaseoffset=true
alias.s=status
alias.a=!git add . && git status
alias.au=!git add -u . && git status
alias.aa=!git add . && git add -u . && git status
alias.c=commit
alias.cm=commit -m
alias.ca=commit --amend
alias.ac=!git add . && git commit
alias.acm=!git add . && git commit -m
alias.l=log --graph --all --pretty=format:'%C(yellow)%h%C(cyan)%d%Creset %s %C(white)- %an, %ar%Creset'
alias.ll=log --stat --abbrev-commit
alias.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
alias.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
alias.d=diff
alias.master=checkout master
alias.spull=svn rebase
alias.spush=svn dcommit
alias.alias=!git config --list | grep 'alias\.' | sed 's/alias\.\([^=]*\)=\(.*\)/\1\     => \2/' | sort
include.path=~/.gitcinclude
include.path=.githubconfig
include.path=.gitcredential
diff.exif.textconv=exif
credential.helper=osxkeychain
user.name=Luis Cruz
user.email=luismirandacruz@gmail.com
credential.helper=osxkeychain
push.default=simple
core.repositoryformatversion=0
core.filemode=false
core.bare=false
core.logallrefupdates=true
core.ignorecase=true
core.precomposeunicode=true
core.autocrlf=true
remote.origin.url=https://github.com/luiscruz/OpenFOAM-3.0.x.git
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
branch.master.remote=origin
branch.master.merge=refs/heads/master

git diff摘要:

-#include "InterfaceCompositionModel.H"
+#include "interfaceCompositionModel.H"
 #include "phaseModel.H"
 #include "phasePair.H"
-#include "pureMixture.H"
-#include "multiComponentMixture.H"
-#include "rhoThermo.H"

-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

我邀请你克隆代码库：

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

- Luis Cruz

可能存在一个问题，其中 core.ignorecase=true、core.precomposeunicode=true、core.autocrlf=true 特别是 ignorecase。 - yorammi

改动之后，你又克隆了一次吗？ - yorammi

@yorammi 是的，在您发表评论时我还没有这样做，但是我刚刚做了，问题仍然存在。 - Luis Cruz

@max630 我刚刚编辑了问题，并附上了一部分差异。请注意，我没有更改任何内容。这是在克隆存储库后的最新版本。 - Luis Cruz

1

这个代码库确实有问题。我也尝试了 git clone，但无法摆脱修改后的文件。似乎有某种钩子存在。我会尝试解决并告诉你。 - yorammi

显示剩余6条评论

2个回答

网页内容由stack overflow 提供, 点击上面的

可以查看英文原文，
原文链接

- Marina Liu · Answer 1

0

这个链接可能会对你有所帮助，Git拒绝重置/丢弃文件

主要原因是Mac、Linux和Windows使用了不同的换行符。

- Marina Liu

我不应该需要提交或添加任何内容。当我克隆一个存储库时，我应该得到一个没有任何更改需要提交的存储库。 - Luis Cruz

好的，明白了。抱歉误解了。你可以尝试使用 git config --global core.autocrlf input。 - Marina Liu

@LuisCruz，我刚刚更新了我的答案，并分享了一个链接，可能会对你有帮助。请检查一下它是否可以解决你的问题。 - Marina Liu

我检查了链接，似乎与行尾问题有关。但这不是我们这个仓库的情况，从差异摘录中可以看出。无论如何，我已尝试建议的修复方法，但并没有解决问题。 - Luis Cruz

- max630 · Answer 2

比较https://github.com/OpenFOAM/OpenFOAM-3.0.x/blob/master/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H和https://github.com/OpenFOAM/OpenFOAM-3.0.x/blob/master/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H

这是两个文件，路径只有大小写不同。您的MacOSX很可能具有不区分大小写的文件系统，这会将它们混在一起。

从它们的外观来看，我会说这不是故意的，而是由于某些错误导致的。有一些选项可以尝试从中恢复，但我建议首先检查官方存储库：http://www.openfoam.com/code/repositories.php，看看是否存在相同的问题。