diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-21 14:02:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-21 14:02:10 -0700 |
| commit | 5d04924e1914a0c63b6467b8cb7194bf68c003cb (patch) | |
| tree | 8b25ce5850f7ec792c6c69972584eec2f9062174 /t | |
| parent | Merge branch 'jn/shell-disable-interactive' (diff) | |
| parent | status: advise to consider use of -u when read_directory takes too long (diff) | |
| download | tgif-5d04924e1914a0c63b6467b8cb7194bf68c003cb.tar.xz | |
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')
| -rwxr-xr-x | t/t7060-wtstatus.sh | 1 | ||||
| -rwxr-xr-x | t/t7508-status.sh | 1 | ||||
| -rwxr-xr-x | t/t7512-status-help.sh | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index f4f38a5e73..52ef06b000 100755 --- a/t/t7060-wtstatus.sh +++ b/t/t7060-wtstatus.sh @@ -5,6 +5,7 @@ test_description='basic work tree status reporting' . ./test-lib.sh test_expect_success setup ' + git config --global advice.statusuoption false && test_commit A && test_commit B oneside added && git checkout A^0 && diff --git a/t/t7508-status.sh b/t/t7508-status.sh index a79c032ffd..aecb4d1e5f 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -8,6 +8,7 @@ test_description='git status' . ./test-lib.sh test_expect_success 'status -h in broken repository' ' + git config --global advice.statusuoption false && mkdir broken && test_when_finished "rm -fr broken" && ( 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 && |