diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-18 00:03:52 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-18 00:03:52 +0400 |
| commit | e845e16ee6de99a203db47eeb840daf3b1914ec9 (patch) | |
| tree | 6881244e543cbf5b17cb31a8b8512fa758a608b5 /t | |
| parent | 46dc1b0e332612aa32c139007fa33f4b429de9d1 (diff) | |
| parent | 98fa473887d0bebd38d568bb07232a336a642dcf (diff) | |
Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other
* jk/maint-ls-files-other:
refactor handling of "other" files in ls-files and status
Conflicts:
read-cache.c
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7502-status.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t7502-status.sh b/t/t7502-status.sh index 1905fb34cd..93f875f500 100755 --- a/t/t7502-status.sh +++ b/t/t7502-status.sh @@ -292,6 +292,12 @@ test_expect_success 'status submodule summary is disabled by default' ' test_cmp expect output ' +# we expect the same as the previous test +test_expect_success 'status --untracked-files=all does not show submodule' ' + git status --untracked-files=all >output && + test_cmp expect output +' + head=$(cd sm && git rev-parse --short=7 --verify HEAD) cat >expect <<EOF |