On Fri, Jun 13, 2014 at 10:48:55AM -0700, Junio C Hamano wrote:
> Caleb Thompson <caleb@xxxxxxxxxxxxxxxx> writes:
>
> > diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh
> > index 35a4d06..402d6a1 100755
> > --- a/t/t7507-commit-verbose.sh
> > +++ b/t/t7507-commit-verbose.sh
> > @@ -7,6 +7,10 @@ write_script check-for-diff <<-'EOF'
> > exec grep '^diff --git' "$1"
> > EOF
> >
> > +write_script check-for-no-diff <<-'EOF'
> > + exec grep -v '^diff --git' "$1"
> > +EOF
>
> This lets grep show all lines that are not "diff --git" in the
> input, and as usual grep exits success if it has any line in the
> output.
>
> $ grep -v '^diff --git' <<\EOF ; echo $?
> diff --git
> a
> EOF
> a
> 0
> $ exit
>
> What are we testing, exactly?
Good catch. It worked when I switched check-for-diff from
check-for-no-diff, but I didn't try to make check-for-no-diff fail
independently, so I apologize.
This version removes the the beginning of a line starting with
"diff --git" from the string, then checks that the result and the
original string are not the same. Switching the != logic to = makes the
tests using check-for-no-diff fail.
write_script check-for-no-diff <<-'EOF'
exec test "${1#*^diff --git} != $1
EOF
Another option is to replace the parameter substitution with a call to
grep:
write_script check-for-no-diff <<-'EOF'
exec test "`grep -v '^diff --git' \"$1\"` != "$1
EOF
I think that the former reads nicer, and requires less escaping, but I'm
open to feedback.
> > @@ -48,6 +52,38 @@ test_expect_success 'verbose diff is stripped out (mnemonicprefix)' '
> > check_message message
> > '
> >
> > +test_expect_success 'commit shows verbose diff with commit.verbose true' '
> > + echo morecontent >>file &&
> > + git add file &&
> > + test_config commit.verbose true &&
> > + test_set_editor "$PWD/check-for-diff" &&
> > + git commit --amend
> > +'
> > +
> > +test_expect_success 'commit --verbose overrides commit.verbose false' '
> > + echo evenmorecontent >>file &&
> > + git add file &&
> > + test_config commit.verbose false &&
> > + test_set_editor "$PWD/check-for-diff" &&
> > + git commit --amend --verbose
> > +'
> > +
> > +test_expect_success 'commit does not show verbose diff with commit.verbose false' '
> > + echo evenmorecontent >>file &&
> > + git add file &&
> > + test_config commit.verbose false &&
> > + test_set_editor "$PWD/check-for-no-diff" &&
> > + git commit --amend
> > +'
> > +
> > +test_expect_success 'commit --no-verbose overrides commit.verbose true' '
> > + echo evenmorecontent >>file &&
> > + git add file &&
> > + test_config commit.verbose true &&
> > + test_set_editor "$PWD/check-for-no-diff" &&
> > + git commit --amend --no-verbose
> > +'
> > +
> > cat >diff <<'EOF'
> > This is an example commit message that contains a diff.
> >
> > --
> > 2.0.0
Caleb Thompson
Attachment:
pgpgaMJXHDQCI.pgp
Description: PGP signature