summaryrefslogtreecommitdiff
path: root/t/t7508-status.sh
diff options
context:
space:
mode:
authorLibravatar Jorge Juan Garcia Garcia <Jorge-Juan.Garcia-Garcia@ensimag.imag.fr>2013-06-11 15:34:05 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-15 22:15:28 -0700
commit0e254bbd22ba3f62c0bbf5055c307391a5920eaa (patch)
tree4651cec77b35fb8276c0b882df653807a3b8003a /t/t7508-status.sh
parentstatus: introduce status.short to enable --short by default (diff)
downloadtgif-0e254bbd22ba3f62c0bbf5055c307391a5920eaa.tar.xz
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 <Jorge-Juan.Garcia-Garcia@ensimag.imag.fr> Signed-off-by: Mathieu Lienard--Mayor <Mathieu.Lienard--Mayor@ensimag.imag.fr> Reviewed-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> Signed-off-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7508-status.sh')
-rwxr-xr-xt/t7508-status.sh27
1 files changed, 27 insertions, 0 deletions
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
'