diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-24 15:18:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-24 15:18:07 (GMT) |
| commit | 908a0e6b98e5a7c4b299b3643823bdefb4fa512e (patch) | |
| tree | bf2121d7fd055264b4d1504283aebed64c13552f /t | |
| parent | 1f3a412dfaf2d12583e3286c6d20b403da8cc963 (diff) | |
| download | git-908a0e6b98e5a7c4b299b3643823bdefb4fa512e.zip git-908a0e6b98e5a7c4b299b3643823bdefb4fa512e.tar.gz git-908a0e6b98e5a7c4b299b3643823bdefb4fa512e.tar.bz2 | |
Revert "Merge branch 'jg/status-config'"
This reverts commit 1a22bd31f0a5130ce6c934951a5526ceb774c2be, reversing
changes made to 3e7a5b489e45ae8a3a0b222893d58b172d883136.
It makes it impossible to "git commit" when status.short is set, and
also "git status --porcelain" output is affected by status.branch.
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7508-status.sh | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/t/t7508-status.sh b/t/t7508-status.sh index 498332c..e2ffdac 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -1335,61 +1335,4 @@ test_expect_failure '.git/config ignore=all suppresses submodule summary' ' git config -f .gitmodules --remove-section submodule.subname ' -test_expect_success 'setup of test environment' ' - git config status.showUntrackedFiles no && - git status -s >expected_short && - git status --no-short >expected_noshort -' - -test_expect_success '"status.short=true" same as "-s"' ' - git -c status.short=true status >actual && - test_cmp expected_short actual -' - -test_expect_success '"status.short=true" weaker than "--no-short"' ' - git -c status.short=true status --no-short >actual && - test_cmp expected_noshort actual -' - -test_expect_success '"status.short=false" same as "--no-short"' ' - git -c status.short=false status >actual && - test_cmp expected_noshort actual -' - -test_expect_success '"status.short=false" weaker than "-s"' ' - git -c status.short=false status -s >actual && - test_cmp expected_short actual -' - -test_expect_success '"status.branch=true" same as "-b"' ' - git status -sb >expected_branch && - git -c status.branch=true status -s >actual && - test_cmp expected_branch actual -' - -test_expect_success '"status.branch=true" different from "--no-branch"' ' - git status -s --no-branch >expected_nobranch && - git -c status.branch=true status -s >actual && - test_must_fail test_cmp expected_nobranch actual -' - -test_expect_success '"status.branch=true" weaker than "--no-branch"' ' - git -c status.branch=true status -s --no-branch >actual && - test_cmp expected_nobranch actual -' - -test_expect_success '"status.branch=false" same as "--no-branch"' ' - git -c status.branch=false status -s >actual && - test_cmp expected_nobranch actual -' - -test_expect_success '"status.branch=false" weaker than "-b"' ' - git -c status.branch=false status -sb >actual && - test_cmp expected_branch actual -' - -test_expect_success 'Restore default test environment' ' - git config --unset status.showUntrackedFiles -' - test_done |