Re: [PATCHv2 1/2] git p4: Fixing script editor checks

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 11, 2012, 17:14 UTC
Message-ID: <7vpqbekx7h.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1334157684-31402-2-git-send-email-luke@diamand.org>

Luke Diamand <luke@diamand.org> writes:

> If P4EDITOR is defined, the tests will fail when "git p4" starts an
> editor.

Is that a problem specific to tests, or should "git p4" itself unset that environment? If it is a problem specific to tests, would it be a better fix to add "P4EDITOR=:" like we do for EDITOR in t/test-lib.sh?

Show 28 quoted lines

>
> Signed-off-by: Luke Diamand <luke@diamand.org>
> ---
>  t/t9800-git-p4-basic.sh |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
> index 13be144..b2f0869 100755
> --- a/t/t9800-git-p4-basic.sh
> +++ b/t/t9800-git-p4-basic.sh
> @@ -335,7 +335,7 @@ test_expect_success 'detect renames' '
>  	test_when_finished cleanup_git &&
>  	(
>  		cd "$git" &&
> -		git config git-p4.skipSubmitEditCheck true &&
> +		git config git-p4.skipSubmitEdit true &&
>  
>  		git mv file1 file4 &&
>  		git commit -a -m "Rename file1 to file4" &&
> @@ -394,7 +394,7 @@ test_expect_success 'detect copies' '
>  	test_when_finished cleanup_git &&
>  	(
>  		cd "$git" &&
> -		git config git-p4.skipSubmitEditCheck true &&
> +		git config git-p4.skipSubmitEdit true &&
>  
>  		cp file2 file8 &&
>  		git add file8 &&