Skip to content

Commit

Permalink
Ignore zlib submodule if its dirty (due to CMake)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
chwarr committed Feb 7, 2018
1 parent e17592c commit 8472e40
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 8472e40

Please sign in to comment.