Re: [PATCH v3 06/11] Add a test for `git replace --convert-graft-file`

[Johannes Schindelin <Johannes.Schindelin@gmx.de>]

[-- Attachment #1: Type: text/plain, Size: 1782 bytes --]

Hi Gábor,

On Sat, 21 Apr 2018, SZEDER Gábor wrote:

> > The proof, as the saying goes, lies in the pudding. So here is a
> > regression test that not only demonstrates what the option is supposed to
> > accomplish, but also demonstrates that it does accomplish it.
> > 
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
> >  t/t6050-replace.sh | 20 ++++++++++++++++++++
> >  1 file changed, 20 insertions(+)
> > 
> > diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
> > index c630aba657e..8a3ee7c3db9 100755
> > --- a/t/t6050-replace.sh
> > +++ b/t/t6050-replace.sh
> > @@ -444,4 +444,24 @@ test_expect_success GPG '--graft on a commit with a mergetag' '
> >  	git replace -d $HASH10
> >  '
> >  
> > +test_expect_success '--convert-graft-file' '
> > +	: add and convert graft file &&
> > +	printf "%s\n%s %s\n\n# comment\n%s\n" \
> > +		$(git rev-parse HEAD^^ HEAD^ HEAD^^ HEAD^2) \
> > +		>.git/info/grafts &&
> > +	git replace --convert-graft-file &&
> > +	test_path_is_missing .git/info/grafts &&
> > +
> > +	: verify that the history is now "grafted" &&
> > +	git rev-list HEAD >out &&
> > +	test_line_count = 4 out &&
> > +
> > +	: create invalid graft file and verify that it is not deleted &&
> > +	test_when_finished "rm -f .git/info/grafts" &&
> > +	echo $EMPTY_BLOB $EMPTY_TREE >.git/info/grafts &&
> > +	test_must_fail git replace --convert-graft-file 2>err &&
> > +	grep "$EMPTY_BLOB $EMPTY_TREE" err &&
> 
> This should be 'test_i18ngrep'.  Apparently this error message is
> translated, and, consequently, the check fails in a GETTEXT_POISON
> build.

Sure enough, you're right! I thought it would not be translated, what with
being an parameter to a formatted string...

Will fix,
Dscho