diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2018-02-08 10:28:56 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-02-08 10:28:56 -0800 |
| commit | 100e0a78ebc1ecfaefb57c5105506b3091d4b86c (patch) | |
| tree | 307fb7bbd12a574fc3544be59d5d357e11e5a878 | |
| parent | 7bd5e18fea0201fed3edd74e3c3d7caf9040609c (diff) | |
| parent | 8472e4032a43d9ec41693d07325a1fe38a84f2df (diff) | |
Merge pull request #14341 from chwarr/ignore-dirty-zlib-submodule
Ignore zlib submodule if its dirty (due to CMake)
| -rw-r--r-- | .gitmodules | 4 |
1 files changed, 4 insertions, 0 deletions
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 |