Git 签出/拉不删除目录？

我有我的回购@github。我在家里做了些工作，然后推给了 Github。它涉及到一些文件和目录的删除。现在我在我的工作框上，它在删除文件和目录之前有一个代码的副本。

我发出以下声明:

git remote update
git checkout HEAD
git pull origin HEAD

它删除了所有应该有的文件，但没有删除文件所在的目录。

两个问题:

  1. 为什么它没有删除目录？
  2. 是否有一个 git 命令，我可以在当前状态下发出删除它们？
43802 次浏览
小开

Git does not track directories currently (see git wiki), that is, you neither can add empty directories nor will git remove directories that end up empty. (EDIT: Thanks, Manni, I was wrong! You can't add empty directories, but git will remove directories that become empty because their tracked content was deleted.)

As to the command to remove the empty directories: that depends on your operating system.

For Linux you could use, e.g.,

find -depth -type d -empty -exec rmdir {} \;

However, this will remove all empty directories!

小开

As part of most operations that alter the working tree (pull, merge, checkout, etc.) git will remove any directories which are made empty by that operation (i.e. git removed the last file).

git won't remove any directories that aren't completely empty, so if you have hidden or ignored files then just because git removes the last tracked file from that directory doesn't necessarily mean that git will be able to remove that directory. git doesn't consider this to be an error condition so won't complain about it.

小开
最佳答案

Git doesn't track directories, so it won't remove ones that become empty as a result of a merge or other change. However, you can use git clean -fd to remove untracked directories (the -fd flag means force removal of untracked files and directories).

小开

Git doesn't track directories, files (with their path). Git creates all the directories for those paths if they don't exist yet (cool!), however it does not delete them if all the files contained in a path are moved or deleted (not cool ☹ ... but there's reasons).

Solution (once you have pulled / fast-forwarded / merged):

git stash --include-untracked
git clean -fd
git stash pop

If you don't stash before clean, you will loose all your untracked files (irreversibly).

Note: since this cleans all ignored files too, you might need to run some of your build scripts again to recreate project metadata (ex: ./gradlew eclipse). This also delete directories that are empty and that were never part of paths of git files.

小开

I had same issue, in my case on build service (CI).. as GIT pulls all files without cleaning folders, all the bin / obj that were previously builded by the CI are dirty, so If I remove a test project, the bin will still contain the DLL and will mention tests that does not exist.

In order to solve this issue; this command seems to do the trick (at least for me)

git clean -fd -x

where X will remove all untracked files:

-X Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files.


提交答案