From: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
The fsmonitor feature struggles with submodules. Disable the
GIT_TEST_FSMONITOR environment variable before running tests with
a lot of submodule interactions.
Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
---
t/t4060-diff-submodule-option-diff-format.sh | 3 +++
t/t5526-fetch-submodules.sh | 2 ++
t/t7402-submodule-rebase.sh | 3 +++
t/t7406-submodule-update.sh | 2 ++
t/t7506-status-submodule.sh | 3 +++
t/t7508-status.sh | 3 +++
6 files changed, 16 insertions(+)
diff --git a/t/t4060-diff-submodule-option-diff-format.sh b/t/t4060-diff-submodule-option-diff-format.sh
index 9dcb69df5c..017417790e 100755
--- a/t/t4060-diff-submodule-option-diff-format.sh
+++ b/t/t4060-diff-submodule-option-diff-format.sh
@@ -15,6 +15,9 @@ This test tries to verify the sanity of --submodule=diff option of git diff.
# Tested non-UTF-8 encoding
test_encoding="ISO8859-1"
+# fsmonitor does not work well with submodules
+GIT_TEST_FSMONITOR=""
+
# String "added" in German (translated with Google Translate), encoded in UTF-8,
# used in sample commit log messages in add_file() function below.
added=$(printf "hinzugef\303\274gt")
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index 63205dfdf9..fb346bff05 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -1,6 +1,8 @@
#!/bin/sh
# Copyright (c) 2010, Jens Lehmann
+GIT_TEST_FSMONITOR=""
+
test_description='Recursive "git fetch" for submodules'
. ./test-lib.sh
diff --git a/t/t7402-submodule-rebase.sh b/t/t7402-submodule-rebase.sh
index 8e32f19007..c78e9009cf 100755
--- a/t/t7402-submodule-rebase.sh
+++ b/t/t7402-submodule-rebase.sh
@@ -7,6 +7,9 @@ test_description='Test rebasing, stashing, etc. with submodules'
. ./test-lib.sh
+# fsmonitor does not work well with submodules
+GIT_TEST_FSMONITOR=""
+
test_expect_success setup '
echo file > file &&
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index c973278300..8d93aaef5f 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -11,6 +11,8 @@ submodule and "git submodule update --rebase/--merge" does not detach the HEAD.
. ./test-lib.sh
+# fsmonitor does not work well with submodules
+GIT_TEST_FSMONITOR=""
compare_head()
{
diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index 08629a6e70..1a716f2c2a 100755
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -4,6 +4,9 @@ test_description='git status for submodule'
. ./test-lib.sh
+# fsmonitor does not work well with submodules
+GIT_TEST_FSMONITOR=""
+
test_create_repo_with_commit () {
test_create_repo "$1" &&
(
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 4e676cdce8..bf0487632d 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -846,6 +846,9 @@ test_expect_success 'status refreshes the index' '
test_cmp expect output
'
+# fsmonitor does not work well with submodules
+GIT_TEST_FSMONITOR=""
+
test_expect_success 'setup status submodule summary' '
test_create_repo sm && (
cd sm &&
--
gitgitgadget
