Re: [PATCHv6 2/4] t7512-status-help.sh: better advices for git status

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 3, 2012, 21:18 UTC
Message-ID: <7vvcj8xffp.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1338748217-16440-2-git-send-email-Lucien.Kong@ensimag.imag.fr>

Kong Lucien <Lucien.Kong@ensimag.imag.fr> writes:

Show 13 quoted lines

> The following tests include several cases in which the user needs to
> run 'git status' to know his current situation, whether there're
> conflicts or he's in rebase/bisect/am/ cherry-pick progress.
>
> One of the test is about the set of the advice.statushints config key
> to 'false' in .git/config.
>
> Signed-off-by: Kong Lucien <Lucien.Kong@ensimag.imag.fr>
> Signed-off-by: Duperray Valentin <Valentin.Duperray@ensimag.imag.fr>
> Signed-off-by: Jonas Franck <Franck.Jonas@ensimag.imag.fr>
> Signed-off-by: Nguy Thomas <Thomas.Nguy@ensimag.imag.fr>
> Signed-off-by: Nguyen Huynh Khoi Nguyen <Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr>
> Signed-off-by: Moy Matthieu <Matthieu.Moy@grenoble-inp.fr>

Are these spelling of names correct?

I thought Matthieu always called himself "Matthieu Moy", not the other way around. I also inferred the convention used for naming the mailboxes at your institution to be "$First.$Last@$Domain", which tells me that perhaps these names are all spelled backwards, i.e. "$Last $First", which probably goes against the convention used around you and Matthieu?

Show 24 quoted lines

> diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
> new file mode 100755
> index 0000000..5f62262
> --- /dev/null
> +++ b/t/t7512-status-help.sh
> @@ -0,0 +1,303 @@
> +#!/bin/sh
> +#
> +# Copyright (c) 2012 Valentin Duperray, Lucien Kong, Franck Jonas,
> +#		     Thomas Nguy, Khoi Nguyen
> +#		     Grenoble INP Ensimag
> +#
> +
> +test_description='git status advices'
> +
> +. ./test-lib.sh
> +
> +. "$TEST_DIRECTORY"/lib-rebase.sh
> +
> +set_fake_editor
> +
> +test_expect_success 'status when conflicts unresolved' '
> +	git init git &&
> +	cd git &&

Eek.

Later tests seem to use

	git init git &&
	(
		cd git &&
                ... everything is done inside git subdirectory ...
	)

with either "test_when_finished 'rm -fr git'" clean-up before the first "git init git" or "&& rm -fr git" at the end of the && chain.

Please be consistent.  If you want _me_ to pick one, I'd say

	test_when_finished 'rm -fr git' &&
        git init git &&
        (
        	cd git &&
                ... do everything in git subdirectory ...
	)

would be my choice.

> +test_expect_success 'status when rebase in progress before rebase --continue' '
> +	test_when_finished "cd ../ && rm -rf git" &&

I've said why this is wrong; I won't repeat it.