diff options
| author |  Christopher Warrington <chwarr@microsoft.com> | 2018-01-25 13:06:25 -0800 |
|---|---|---|
| committer | Christopher Warrington <chwarr@microsoft.com> | 2018-02-06 16:30:36 -0800 |
| commit | 8472e4032a43d9ec41693d07325a1fe38a84f2df (patch) | |
| tree | 014c4aca526e1149a49e786e7114cd0d62a1344d /.gitmodules | |
| parent | e17592c929e5dd4e7dc9b4bb9545fe9820edf9f0 (diff) | |
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.
Diffstat (limited to '.gitmodules')
| -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 |