summaryrefslogtreecommitdiff
path: root/t/t7512-status-help.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-21 14:02:10 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-21 14:02:10 -0700
commit5d04924e1914a0c63b6467b8cb7194bf68c003cb (patch)
tree8b25ce5850f7ec792c6c69972584eec2f9062174 /t/t7512-status-help.sh
parent03da85b954507749af01545888a20b7643761d58 (diff)
parent6a38ef2ced55f0a8a7967581934e40f79e1d8733 (diff)
downloadgit-5d04924e1914a0c63b6467b8cb7194bf68c003cb.tar.gz
Merge branch 'tb/document-status-u-tradeoff'
Suggest users to look into using--untracked=no option when "git status" takes too long. * tb/document-status-u-tradeoff: status: advise to consider use of -u when read_directory takes too long git status: document trade-offs in choosing parameters to the -u option
Diffstat (limited to 't/t7512-status-help.sh')
-rwxr-xr-xt/t7512-status-help.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index d2da89a5f5..9d4610629d 100755
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -14,6 +14,7 @@ test_description='git status advice'
set_fake_editor
test_expect_success 'prepare for conflicts' '
+ git config --global advice.statusuoption false &&
test_commit init main.txt init &&
git branch conflicts &&
test_commit on_master main.txt on_master &&