Re: [PATCH 1/3] rebase -i: identify problems with core.commentchar

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Nov 22, 2016, 16:09 UTC
Message-ID: <alpine.DEB.2.20.1611221706470.3746@virtualbox>
In-Reply-To: <xmqqbmx8k8c0.fsf@gitster.mtv.corp.google.com>

Hi Junio,

On Mon, 21 Nov 2016, Junio C Hamano wrote:

Show 16 quoted lines

> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> 
> > diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh
> > index 29e91d8..202ac07 100755
> > --- a/t/t0030-stripspace.sh
> > +++ b/t/t0030-stripspace.sh
> > @@ -432,6 +432,13 @@ test_expect_success '-c with changed comment char' '
> >  	test_cmp expect actual
> >  '
> >  
> > +test_expect_failure '-c with comment char defined in .git/config' '
> > +	test_config core.commentchar = &&
> > +	printf "= foo\n" >expect &&
> > +	printf "foo" | git stripspace -c >actual &&
> 
> We'd want "\n" on this printf to match the one before as well,

True.

> The analysis of the log message in [2/3] is wrong and needs
> updating, though.

Thanks for following up on that, and for fixing the commit message.

Show 11 quoted lines

> > +test_expect_failure 'rebase -i respects core.commentchar=auto' '
> > +	test_config core.commentchar auto &&
> > +	write_script copy-edit-script.sh <<-\EOF &&
> > +	cp "$1" edit-script
> > +	EOF
> > +	test_set_editor "$(pwd)/copy-edit-script.sh" &&
> > +	test_when_finished "git rebase --abort || :" &&
> > +	git rebase -i HEAD^ &&
> > +	grep "^#" edit-script &&
> 
> This was added for debugging that was forgotten?

No, this was me trying to ensure that the comment character '#' *is* used. As opposed to somehow testing any edit script that contains no commented lines whatsoever.

But if you don't care, I won't, either.

Ciao, Dscho