summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2023-01-31 16:07:27 +0100
committerSergei Golubchik <serg@mariadb.org>2023-02-21 23:22:56 +0100
commit3c6f108540862ef91889ee2bf975fad64237dabb (patch)
tree72b969c8f89ab477add28148a96497acbbbde117
parent358635bbad5082026603deda0cff93427a38c069 (diff)
downloadmariadb-git-3c6f108540862ef91889ee2bf975fad64237dabb.tar.gz
Revert "ignore changes in submodules when committing everything"
This reverts commit d78ac04ee609b0b63bb688be2a837a6ca7670392. The benefits of `ignore=all` are that submodules are omitted from `git status` and `git citool`. The drawbacks are - submodules are not omitted from `git commit -a` *and* they are omitted from `git diff` and `git show` output. As a result one can unintentionally commit changes to submodules and not see it in the history. Thus drawbacks outweigh benefits here.
-rw-r--r--.gitmodules4
1 files changed, 0 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules
index 30f950b00e7..921a4782f4f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,17 +1,13 @@
[submodule "libmariadb"]
path = libmariadb
url = https://github.com/MariaDB/mariadb-connector-c.git
- ignore = all
[submodule "storage/rocksdb/rocksdb"]
path = storage/rocksdb/rocksdb
url = https://github.com/facebook/rocksdb.git
- ignore = all
[submodule "wsrep-lib"]
path = wsrep-lib
url = https://github.com/codership/wsrep-lib.git
branch = master
- ignore = all
[submodule "extra/wolfssl/wolfssl"]
path = extra/wolfssl/wolfssl
url = https://github.com/wolfSSL/wolfssl.git
- ignore = all