diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:23 -0700 |
| commit | 82e7ee7351d6e328294016d3b99825d8001abd24 (patch) | |
| tree | 4940740a6f217d1c9f0abc415766a3a690e627fc /t | |
| parent | b7ef48d5d5f0d5b912a5ca84a7079803387586ae (diff) | |
| parent | 980bde389491e65df3a6f26f755064013b65740c (diff) | |
| download | git-82e7ee7351d6e328294016d3b99825d8001abd24.tar.gz | |
Merge branch 'mg/advice-statushints'
* mg/advice-statushints:
wt-status: take advice.statusHints seriously
t7508: test advice.statusHints
Conflicts:
wt-status.c
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7508-status.sh | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/t/t7508-status.sh b/t/t7508-status.sh index a9df7ff7bd..008d5711b8 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -69,6 +69,34 @@ test_expect_success 'status (2)' ' ' cat >expect <<\EOF +# On branch master +# Changes to be committed: +# new file: dir2/added +# +# Changed but not updated: +# modified: dir1/modified +# +# Untracked files: +# dir1/untracked +# dir2/modified +# dir2/untracked +# expect +# output +# untracked +EOF + +git config advice.statusHints false + +test_expect_success 'status (advice.statusHints false)' ' + + git status >output && + test_cmp expect output + +' + +git config --unset advice.statusHints + +cat >expect <<\EOF M dir1/modified A dir2/added ?? dir1/untracked @@ -115,6 +143,23 @@ test_expect_success 'status (status.showUntrackedFiles no)' ' test_cmp expect output ' +cat >expect <<EOF +# On branch master +# Changes to be committed: +# new file: dir2/added +# +# Changed but not updated: +# modified: dir1/modified +# +# Untracked files not listed +EOF +git config advice.statusHints false +test_expect_success 'status -uno (advice.statusHints false)' ' + git status -uno >output && + test_cmp expect output +' +git config --unset advice.statusHints + cat >expect << EOF M dir1/modified A dir2/added |