diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-01 09:19:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-01 09:19:30 -0700 |
| commit | fec274b01f39262f945edb64c14c3bfe130b5bef (patch) | |
| tree | a1b30b637f50bd78c19bf3611ff2fae52056b40a /t | |
| parent | 41e603af58c3814d06e1c2b5d1449d516007a255 (diff) | |
| parent | 6a38ef2ced55f0a8a7967581934e40f79e1d8733 (diff) | |
| download | git-fec274b01f39262f945edb64c14c3bfe130b5bef.tar.gz git-fec274b01f39262f945edb64c14c3bfe130b5bef.tar.xz | |
Merge branch 'tb/document-status-u-tradeoff' into maint
* 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 f4f38a5e7..52ef06b00 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 a79c032ff..aecb4d1e5 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 d2da89a5f..9d4610629 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 && |