Ignore zlib submodule if its dirty (due to CMake)

When using CMake to build, the zlib submodule ends up with a generated
file that makes Git consider the submodule dirty. This state can be
ignored for day-to-day development on gRPC.

We cannot use the weaker "ignore = untracked" as the build process
deletes a tracked file as well as generating a new file.
This commit is contained in:
Christopher Warrington 2018-01-25 13:06:25 -08:00
Родитель e17592c929
Коммит 8472e4032a
1 изменённых файлов: 4 добавлений и 0 удалений

4
.gitmodules поставляемый
Просмотреть файл

@ -1,6 +1,10 @@
[submodule "third_party/zlib"]
path = third_party/zlib
url = https://github.com/madler/zlib
# When using CMake to build, the zlib submodule ends up with a
# generated file that makes Git consider the submodule dirty. This
# state can be ignored for day-to-day development on gRPC.
ignore = dirty
[submodule "third_party/protobuf"]
path = third_party/protobuf
url = https://github.com/google/protobuf.git