From 50e4f757f4adda096239c1ad60499cf606bf2c6f Mon Sep 17 00:00:00 2001 From: Jorge Juan Garcia Garcia Date: Tue, 11 Jun 2013 15:34:04 +0200 Subject: status: introduce status.short to enable --short by default Some people always run 'git status -s'. The configuration variable status.short allows to set it by default. Signed-off-by: Jorge Juan Garcia Garcia Signed-off-by: Mathieu Lienard--Mayor Reviewed-by: Matthieu Moy Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- t/t7508-status.sh | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 't') diff --git a/t/t7508-status.sh b/t/t7508-status.sh index e2ffdacc26..33cadd08c7 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -1335,4 +1335,34 @@ 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 'Restore default test environment' ' + git config --unset status.showUntrackedFiles +' + test_done -- cgit v1.2.3 From 0e254bbd22ba3f62c0bbf5055c307391a5920eaa Mon Sep 17 00:00:00 2001 From: Jorge Juan Garcia Garcia Date: Tue, 11 Jun 2013 15:34:05 +0200 Subject: status: introduce status.branch to enable --branch by default Some people often run 'git status -b'. The config variable status.branch allows to set it by default. Signed-off-by: Jorge Juan Garcia Garcia Signed-off-by: Mathieu Lienard--Mayor Reviewed-by: Matthieu Moy Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- t/t7508-status.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 't') diff --git a/t/t7508-status.sh b/t/t7508-status.sh index 33cadd08c7..498332ce0a 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -1361,6 +1361,33 @@ test_expect_success '"status.short=false" weaker than "-s"' ' 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 ' -- cgit v1.2.3