git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* v3 [PATCH 1/2] status: introduce status.short to enable --short by default
@ 2013-06-10 15:13 y
  2013-06-10 15:13 ` v3 [PATCH 2/2] status:introduce status.branch to enable --branch " y
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: y @ 2013-06-10 15:13 UTC (permalink / raw)
  To: git
  Cc: gitster, Jorge Juan Garcia Garcia, Mathieu Lienard--Mayor, Matthieu Moy

From: Jorge Juan Garcia Garcia <Jorge-Juan.Garcia-Garcia@ensimag.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 <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 to be commented:
- Cleaning 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


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* v3 [PATCH 2/2] status:introduce status.branch to enable --branch by default
  2013-06-10 15:13 v3 [PATCH 1/2] status: introduce status.short to enable --short by default y
  2013-06-10 15:13 ` v3 [PATCH 2/2] status:introduce status.branch to enable --branch " y
@ 2013-06-10 15:13 ` y
  2013-06-10 15:20 ` v3 [PATCH 1/2] status: introduce status.short to enable --short " Matthieu Moy
  2 siblings, 0 replies; 7+ messages in thread
From: y @ 2013-06-10 15:13 UTC (permalink / raw)
  To: git
  Cc: gitster, Jorge Juan Garcia Garcia, Mathieu Lienard--Mayor, Matthieu Moy

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 to be commented:
- Cleaning 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

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* v3 [PATCH 2/2] status:introduce status.branch to enable --branch by default
  2013-06-10 15:13 v3 [PATCH 1/2] status: introduce status.short to enable --short by default y
@ 2013-06-10 15:13 ` y
  2013-06-10 15:13 ` y
  2013-06-10 15:20 ` v3 [PATCH 1/2] status: introduce status.short to enable --short " Matthieu Moy
  2 siblings, 0 replies; 7+ messages in thread
From: y @ 2013-06-10 15:13 UTC (permalink / raw)
  To: git
  Cc: gitster, Jorge Juan Garcia Garcia, Mathieu Lienard--Mayor, Matthieu Moy

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 to be commented:
- Cleaning 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


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: v3 [PATCH 1/2] status: introduce status.short to enable --short by default
  2013-06-10 15:13 v3 [PATCH 1/2] status: introduce status.short to enable --short by default y
  2013-06-10 15:13 ` v3 [PATCH 2/2] status:introduce status.branch to enable --branch " y
  2013-06-10 15:13 ` y
@ 2013-06-10 15:20 ` Matthieu Moy
  2013-06-10 18:02   ` Junio C Hamano
  2 siblings, 1 reply; 7+ messages in thread
From: Matthieu Moy @ 2013-06-10 15:20 UTC (permalink / raw)
  To: Jorge Juan Garcia Garcia; +Cc: git, gitster, Mathieu Lienard--Mayor

y@ensimag.imag.fr writes:

> To: y@ensimag.imag.fr

Common mistake, but you're not supposed to answer "y" when you're
prompted for an email ;-).

set sendemail.from to avoid this.

> +test_expect_success '"Setup of environment of test"' '

Same problem as v2.

> +test_expect_success '"Back to environment of test by default"' '
> +	git config status.showUntrackedFiles yes

Same.

Probably something went wrong during your rebase.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: v3 [PATCH 1/2] status: introduce status.short to enable --short by default
  2013-06-10 15:20 ` v3 [PATCH 1/2] status: introduce status.short to enable --short " Matthieu Moy
@ 2013-06-10 18:02   ` Junio C Hamano
  0 siblings, 0 replies; 7+ messages in thread
From: Junio C Hamano @ 2013-06-10 18:02 UTC (permalink / raw)
  To: Matthieu Moy; +Cc: Jorge Juan Garcia Garcia, git, Mathieu Lienard--Mayor

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

> y@ensimag.imag.fr writes:
>
>> To: y@ensimag.imag.fr
>
> Common mistake, but you're not supposed to answer "y" when you're
> prompted for an email ;-).

Didn't we introduce safety against this in v1.7.12.1 and later?  Is
the new release taking more than 9 months to percolate, or are there
still other codepaths that allow this to happen that we need to add
further safety?

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: v3 [PATCH 2/2] status:introduce status.branch to enable --branch by default
  2013-06-11  7:30 ` v3 [PATCH 2/2] status:introduce status.branch to enable --branch " Ramkumar Ramachandra
@ 2013-06-11  7:51   ` Matthieu Moy
  0 siblings, 0 replies; 7+ messages in thread
From: Matthieu Moy @ 2013-06-11  7:51 UTC (permalink / raw)
  To: Ramkumar Ramachandra
  Cc: git, gitster, Jorge Juan Garcia Garcia, Mathieu Lienard--Mayor

Ramkumar Ramachandra <artagnon@gmail.com> writes:

> <y@ensimag.imag.fr> wrote:
>> [...]
>
> Good change.
>
>> 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
>
> I expected one test.  Two, at most.  This is a bit overzealous. 

I actually had this discussion with Jorge (in real life). I first
thought this was too much, and I think we already removed one rendundant
test. But actually, this should be "two at least", since you really want
to test whether --[no-]branch takes precedence over status.branch or
not, in addition to testing status.branch alone.

The last two tests are less important, but they also test something (in
short: what happens when branch.status is set to something other than
"true"). So I think it makes sense to keep them.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: v3 [PATCH 2/2] status:introduce status.branch to enable --branch by default
       [not found] <51b5ede3.41a42a0a.02a1.3464SMTPIN_ADDED_BROKEN@mx.google.com>
@ 2013-06-11  7:30 ` Ramkumar Ramachandra
  2013-06-11  7:51   ` Matthieu Moy
  0 siblings, 1 reply; 7+ messages in thread
From: Ramkumar Ramachandra @ 2013-06-11  7:30 UTC (permalink / raw)
  To: y
  Cc: git, gitster, Jorge Juan Garcia Garcia, Mathieu Lienard--Mayor,
	Matthieu Moy

<y@ensimag.imag.fr> wrote:
> [...]

Good change.

> 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

I expected one test.  Two, at most.  This is a bit overzealous.  I
don't mind leaving it as it is, but as a note for the future: this
kind of overkill is not necessarily a good thing; it makes it hard to
add/remove tests, multiple tests fail when one tiny feature doesn't
work as expected, and the testsuite takes longer to run.

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2013-06-11  7:52 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-10 15:13 v3 [PATCH 1/2] status: introduce status.short to enable --short by default y
2013-06-10 15:13 ` v3 [PATCH 2/2] status:introduce status.branch to enable --branch " y
2013-06-10 15:13 ` y
2013-06-10 15:20 ` v3 [PATCH 1/2] status: introduce status.short to enable --short " Matthieu Moy
2013-06-10 18:02   ` Junio C Hamano
     [not found] <51b5ede3.41a42a0a.02a1.3464SMTPIN_ADDED_BROKEN@mx.google.com>
2013-06-11  7:30 ` v3 [PATCH 2/2] status:introduce status.branch to enable --branch " Ramkumar Ramachandra
2013-06-11  7:51   ` Matthieu Moy

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 NNTP newsgroup(s).