Merge pull request #14341 from chwarr/ignore-dirty-zlib-submodule

Ignore zlib submodule if its dirty (due to CMake)
7 years ago · 100e0a78eb
parent 7bd5e18fea 8472e4032a
commit 100e0a78eb
1 changed files with 4 additions and 0 deletions
--- 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