git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeremiah Mahler <jmmahler@gmail.com>
To: Caleb Thompson <cjaysson@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2] commit: support commit.verbose and --no-verbose
Date: Sun, 25 May 2014 00:02:10 -0700	[thread overview]
Message-ID: <20140525070210.GA18539@hudson.localdomain> (raw)
In-Reply-To: <20140525062427.GA94219@sirius.att.net>

On Sun, May 25, 2014 at 01:24:27AM -0500, Caleb Thompson wrote:
...
>  	would be committed at the bottom of the commit message
>  	template.  Note that this diff output doesn't have its
> -	lines prefixed with '#'.
> +	lines prefixed with '#'.  The `commit.verbose` configuration
> +	variable can be set to true to implicitly send this option.
> +
> +--no-verbose::
> +	Do not show the unified diff  at the bottom of the commit message
> +	template.  This is the default behavior, but can be used to override
> +	the`commit.verbose` configuration variable.
> 
Why is there two spaces between "diff  at"?
Needs a space between "the`comm" -> "the `comm".

> +cat >check-for-no-diff <<EOF
> +#!$SHELL_PATH
> +exec grep -v '^diff --git' "\$1"
> +EOF
> +chmod +x check-for-no-diff
> +
Me personally, I would leave it like that for now, since that is
the style being used nearby.  We'll see what others have to say.

I certainly wouldn't convert all the other cases to use
test_expect_success.  Leave that for another patch.

> 
> @@ -48,6 +54,21 @@ test_expect_success 'verbose diff is stripped out (mnemonicprefix)' '
>  	check_message message
>  '
> 
> +test_expect_success 'commit shows verbose diff with set commit.verbose' '
> +	echo morecontent >file &&
> +	git add file &&
> +	test_config commit.verbose true &&
> +	check_message message
> +'
> +
> +test_expect_success 'commit does not show verbose diff with --no-verbose' '
> +	echo morecontent >file &&
> +	git add file &&
> +	test_config commit.verbose true &&
> +	test_set_editor "$PWD/check-for-no-diff" &&
> +	git commit --amend --no-verbose
> +'
> +
I like those better with 'test_config' instead of 'git config', good.

Keep working on it, it is looking better :-)

-- 
Jeremiah Mahler
jmmahler@gmail.com
http://github.com/jmahler

  reply	other threads:[~2014-05-25  7:06 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-25  6:24 [PATCH v2] commit: support commit.verbose and --no-verbose Caleb Thompson
2014-05-25  7:02 ` Jeremiah Mahler [this message]
2014-05-25  7:44 ` Jeremiah Mahler
2014-05-25  8:44 ` Duy Nguyen
2014-05-25 10:23 ` Eric Sunshine
2014-05-26 18:56 ` [PATCH v3 0/5] " Caleb Thompson
2014-05-26 18:56   ` [PATCH v3 1/5] commit test: Use test_config instead of git-config Caleb Thompson
2014-05-26 18:56   ` [PATCH v3 2/5] commit test: Change $PWD to $(pwd) Caleb Thompson
2014-05-27  5:46     ` Johannes Sixt
2014-05-27  6:10       ` Eric Sunshine
2014-05-27  6:14       ` Jeremiah Mahler
2014-05-27  6:34         ` Johannes Sixt
2014-05-27  7:35           ` David Kastrup
2014-05-26 18:56   ` [PATCH v3 3/5] commit test: Use write_script Caleb Thompson
2014-05-27 22:30     ` Eric Sunshine
2014-05-27 22:42       ` Junio C Hamano
2014-05-26 18:56   ` [PATCH v3 4/5] commit test: test_set_editor in each test Caleb Thompson
2014-05-27 22:59     ` Eric Sunshine
2014-05-26 18:56   ` [PATCH v3 5/5] commit: support commit.verbose and --no-verbose Caleb Thompson
2014-05-26 20:33     ` Jeremiah Mahler
2014-05-26 20:47       ` Caleb Thompson
     [not found]       ` <CA+g4mq8iGNVm-2Uj8j2bJLDazaTS_U76BO9-jeS9Aw4RZnki5A@mail.gmail.com>
2014-05-26 21:00         ` Jeremiah Mahler
2014-05-26 22:14     ` Jeremiah Mahler
2014-05-26 22:34   ` [PATCH v3 0/5] " Jeremiah Mahler
2014-05-26 22:40     ` Caleb Thompson

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140525070210.GA18539@hudson.localdomain \
    --to=jmmahler@gmail.com \
    --cc=cjaysson@gmail.com \
    --cc=git@vger.kernel.org \
    /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.
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).