diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-02 13:37:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-02 13:37:13 -0800 |
| commit | 86e67a088c581da4da36acf0edd8c27b1033e51e (patch) | |
| tree | ff6c53429e67c4f44f7c7b07cfa8bcb980c7570a /t | |
| parent | d11ddaff021be8006e71b43a5205c48f2dac7f18 (diff) | |
| parent | 98fa473887d0bebd38d568bb07232a336a642dcf (diff) | |
| download | git-86e67a088c581da4da36acf0edd8c27b1033e51e.tar.gz git-86e67a088c581da4da36acf0edd8c27b1033e51e.tar.xz | |
Merge branch 'jk/maint-ls-files-other' into maint
* jk/maint-ls-files-other:
refactor handling of "other" files in ls-files and status
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 c8e4c2e7b..187a13e64 100755 --- a/t/t7502-status.sh +++ b/t/t7502-status.sh @@ -285,6 +285,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 |