# [PATCH v2 2/2] status:introduce status.branch to enable --branch by default 3 messages from 2013-06-10 to 2013-06-10. Participants: Jorge Juan Garcia Garcia, Matthieu Moy. Thread: https://gitlist.dev/t/34091 ## Jorge Juan Garcia Garcia, 2013-06-10 14:40 Subject: [PATCH v2 1/2] status: introduce status.short to enable --short by default Message-ID: <1370875226-31392-1-git-send-email-Jorge-Juan.Garcia-Garcia@ensimag.imag.fr> URL: https://gitlist.dev/e/1370875226-31392-1-git-send-email-Jorge-Juan.Garcia-Garcia%40ensimag.imag.fr ``` 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 Signed-off-by: Matthieu Moy --- Changes since v1: -documentation more accurate -removal of unappropriate function calls -clean-up in the test Documentation/config.txt | 4 ++++ builtin/commit.c | 5 +++++ t/t7508-status.sh | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 0 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 6e53fc5..1983bf7 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2066,6 +2066,10 @@ status.relativePaths:: relative to the repository root (this was the default for Git prior to v1.5.4). +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.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 1621dfc..287f1cb 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1112,6 +1112,11 @@ static int git_status_config(const char *k, const char *v, void *cb) s->submodule_summary = -1; return 0; } + if (!strcmp(k, "status.short")) { + if (git_config_bool(k, v)) + status_format = STATUS_FORMAT_SHORT; + 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 e2ffdac..9a07f15 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -1335,4 +1335,39 @@ test_expect_failure '.git/config ignore=all suppresses submodule summary' ' git config -f .gitmodules --remove-section submodule.subname ' +test_expect_success '"Setup of environment of test"' ' + git config status.showUntrackedFiles no +' + +test_expect_success '"status.short=true" same as "-s"' ' + git -c status.short=true status >actual && + git status -s >expected_short && + test_cmp actual expected_short +' + +test_expect_success '"status.short=true" different from "--no-short"' ' + git status --no-short >expected_noshort && + test_must_fail test_cmp actual expected_noshort +' + +test_expect_success '"status.short=true" weaker than "--no-short"' ' + git -c status.short=true status --no-short >actual && + test_cmp actual expected_noshort +' + +test_expect_success '"status.short=false" same as "--no-short"' ' + git -c status.short=false status >actual && + git status -s >expected_short && + test_cmp actual expected_noshort +' + +test_expect_success '"status.short=false" weaker than "-s"' ' + git -c status.short=false status -s >actual && + test_cmp actual expected_short +' + +test_expect_success '"Back to environment of test by default"' ' + git config status.showUntrackedFiles yes +' + test_done -- 1.7.8 ``` ## Jorge Juan Garcia Garcia, 2013-06-10 14:40 Subject: [PATCH v2 2/2] status:introduce status.branch to enable --branch by default Message-ID: <1370875226-31392-2-git-send-email-Jorge-Juan.Garcia-Garcia@ensimag.imag.fr> URL: https://gitlist.dev/e/1370875226-31392-2-git-send-email-Jorge-Juan.Garcia-Garcia%40ensimag.imag.fr In-Reply-To: <1370875226-31392-1-git-send-email-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 Signed-off-by: Mathieu Lienard--Mayor Signed-off-by: Matthieu Moy --- Changes since v1: -Documentation more accurate -removal of unappropriate function calls -clean up in the test 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 287f1cb..f2b5d44 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1117,6 +1117,10 @@ static int git_status_config(const char *k, const char *v, void *cb) status_format = STATUS_FORMAT_SHORT; 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 9a07f15..958617a 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 actual expected_short ' +test_expect_success '"status.branch=true" same as "-b"' ' + git -c status.branch=true status -s >actual && + git status -sb >expected_branch && + test_cmp actual expected_branch +' + +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 actual expected_nobranch +' + +test_expect_success '"status.branch=true" weaker than "--no-branch"' ' + git -c status.branch=true status -s --no-branch >actual && + test_cmp actual expected_nobranch +' + +test_expect_success '"status.branch=false" same as "--no-branch"' ' + git -c status.branch=false status -s >actual && + test_cmp actual expected_nobranch +' + +test_expect_success '"status.branch=false" weaker than "-b"' ' + git -c status.branch=false status -sb >actual && + test_cmp actual expected_branch +' + test_expect_success '"Back to environment of test by default"' ' git config status.showUntrackedFiles yes ' -- 1.7.8 ``` ## Matthieu Moy, 2013-06-10 14:43 Subject: Re: [PATCH v2 1/2] status: introduce status.short to enable --short by default Message-ID: URL: https://gitlist.dev/e/vpqli6igh5z.fsf%40anie.imag.fr In-Reply-To: <1370875226-31392-1-git-send-email-Jorge-Juan.Garcia-Garcia@ensimag.imag.fr> ``` Jorge Juan Garcia Garcia writes: > +test_expect_success '"Setup of environment of test"' ' Why these double quotes inside single quotes? > +test_expect_success '"Back to environment of test by default"' ' Same. "test environment" would sound better than "environment of test" in english. > + git config status.showUntrackedFiles yes "yes" is not documented as an acceptable value for status.showUntrackedFiles. "git config --unset" is what you want here. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ ```