From 8472e4032a43d9ec41693d07325a1fe38a84f2df Mon Sep 17 00:00:00 2001 From: Christopher Warrington Date: Thu, 25 Jan 2018 13:06:25 -0800 Subject: 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. --- .gitmodules | 4 ++++ 1 file changed, 4 insertions(+) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index c4b0d241dc..52db29be00 100644 --- a/.gitmodules +++ b/.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 -- cgit v1.2.3