From: Jorge-Juan.Garcia-Garcia@ensimag.imag.fr
To: git@vger.kernel.org
Cc: gitster@pobox.com,
Jorge Juan Garcia Garcia
<Jorge-Juan.Garcia-Garcia@ensimag.imag.fr>,
Mathieu Lienard--Mayor <Mathieu.Lienard--Mayor@ensimag.imag.fr>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: [PATCH v4 2/2] status:introduce status.branch to enable --branch by default
Date: Tue, 11 Jun 2013 15:34:05 +0200 [thread overview]
Message-ID: <1370957645-17905-2-git-send-email-Jorge-Juan.Garcia-Garcia@ensimag.imag.fr> (raw)
In-Reply-To: <1370957645-17905-1-git-send-email-Jorge-Juan.Garcia-Garcia@ensimag.imag.fr>
From: Jorge Juan Garcia Garcia <Jorge-Juan.Garcia-Garcia@ensimag.imag.fr>
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>
Signed-off-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
---
Changes since v3:
- Changes in the order in test between expected and actual.
- The number of test is the same (all posibilities that I wanted tested).
---
Documentation/config.txt | 4 ++++
builtin/commit.c | 4 ++++
t/t7508-status.sh | 27 +++++++++++++++++++++++++++
3 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 1983bf7..ecdcd6d 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2070,6 +2070,10 @@ status.short::
Set to true to enable --short by default in linkgit:git-status[1].
The option --no-short takes precedence over this variable.
+status.branch::
+ Set to true to enable --branch by default in linkgit:git-status[1].
+ The option --no-branch takes precedence over this variable.
+
status.showUntrackedFiles::
By default, linkgit:git-status[1] and linkgit:git-commit[1] show
files which are not currently tracked by Git. Directories which
diff --git a/builtin/commit.c b/builtin/commit.c
index 075a91c..b589ce0 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1119,6 +1119,10 @@ static int git_status_config(const char *k, const char *v, void *cb)
status_format = STATUS_FORMAT_NONE;
return 0;
}
+ if (!strcmp(k, "status.branch")) {
+ s->show_branch = git_config_bool(k, v);
+ return 0;
+ }
if (!strcmp(k, "status.color") || !strcmp(k, "color.status")) {
s->use_color = git_config_colorbool(k, v);
return 0;
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 3c0818b..d627f9b 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -1366,6 +1366,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 -c status.branch=true status -s >actual &&
+ git status -sb >expected_branch &&
+ test_cmp expected_branch actual
+'
+
+test_expect_success '"status.branch=true" different from "--no-branch"' '
+ git -c status.branch=true status -s >actual &&
+ git status -s --no-branch >expected_nobranch &&
+ 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
'
--
1.7.8
next prev parent reply other threads:[~2013-06-11 13:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-11 13:34 [PATCH v4 1/2] status: introduce status.short to enable --short by default Jorge-Juan.Garcia-Garcia
2013-06-11 13:34 ` Jorge-Juan.Garcia-Garcia [this message]
2013-06-11 13:43 ` [PATCH v4 2/2] status:introduce status.branch to enable --branch " Matthieu Moy
2013-06-11 21:38 ` [PATCH v4 1/2] status: introduce status.short to enable --short " Junio C Hamano
2013-06-12 6:57 ` Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1370957645-17905-2-git-send-email-Jorge-Juan.Garcia-Garcia@ensimag.imag.fr \
--to=jorge-juan.garcia-garcia@ensimag.imag.fr \
--cc=Mathieu.Lienard--Mayor@ensimag.imag.fr \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).