Re: [PATCH v5] commit: add a commit.verbose config variable

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Mar 14, 2016, 08:24 UTC
Message-ID: <CAPig+cQ+8+saxsGzV=-C2w-eSaaOf0MYC=zTQbH3CW2G5UE5uw@mail.gmail.com>
In-Reply-To: <01020153698edabd-73daa5db-3c3e-417b-8d83-6cbc04439d95-000000@eu-west-1.amazonses.com>

On Sat, Mar 12, 2016 at 1:41 AM, Pranit Bauva <pranit.bauva@gmail.com> wrote:

Show 5 quoted lines

> Add commit.verbose configuration variable as a convenience for those
> who always prefer --verbose.
>
> Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
> Mentored-by: Eric Sunshine <sunshine@sunshineco.com>

More typical would be to say Helped-by: rather than Mentored-by:.

Also, place your sign-off last.

Show 9 quoted lines

> ---
> diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh
> index 2ddf28c..bb7ce7c 100755
> --- a/t/t7507-commit-verbose.sh
> +++ b/t/t7507-commit-verbose.sh
> @@ -96,4 +96,22 @@ test_expect_success 'verbose diff is stripped out with set core.commentChar' '
> +test_expect_success 'commit.verbose true and --verbose omitted' '
> +       test_config commit.verbose true &&
> +       ! git status | grep "*diff --git" &&

This is a bogus regular expression; some greps may barf on it outright, while others will treat "*" as a literal. Either way, it could never match "diff --git" so the test would succeed by accident even if git-status did erroneously respect "commit.verbose".

> +       git commit --amend
> +'

I realize that it's possible to (mis)read Junio's recommendation[1] about also testing git-status as a hint to combine the git-commit and git-status checks into a single test, but that's not what was intended. These are conceptually distinct checks, thus they should each have a separate test. I'd suggest restoring the "commit.verbose=true and --verbose omitted" test as it was shown in [2], and then adding a new test in this script for git-status which looks something like this:

    test_expect_success 'status ignores commit.verbose=true' '
        git status >actual &&
        ! grep "^diff --git" actual
    '

[1]: http://article.gmane.org/gmane.comp.version-control.git/288648 [2]: http://article.gmane.org/gmane.comp.version-control.git/288674

Show 11 quoted lines

> +test_expect_success 'commit.verbose true and --no-verbose' '
> +       test_must_fail git -c commit.verbose=true commit --amend --no-verbose
> +'
> +
> +test_expect_success 'commit.verbose false and --verbose' '
> +       git -c commit.verbose=false commit --amend --verbose
> +'
> +
> +test_expect_success 'commit.verbose false and --verbose omitted' '
> +       test_must_fail git -c commit.verbose=false commit --amend
> +'

Not at all mandatory, but it wouldn't hurt to add a couple additional tests:

* commit.verbose=true and --verbose
* commit.verbose=false and --no-verbose

>  test_done