From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 Mar 2013 14:47:49 GMT
Subject: Re: [PATCH] t7600: test merge configuration override
Message-ID: <7vvc8j8p9m.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1363946943-30269-1-git-send-email-ydroneaud@opteya.com>

Yann Droneaud <ydroneaud@opteya.com> writes:

> +test_expect_success 'merges with merge.ff=only and --no-ff-only' '
> +	git reset --hard c1 &&
> +	test_tick &&
> +	test_when_finished "git config --unset merge.ff" &&
> +	git config merge.ff only &&

I see this was copied from existing tests, but we should use
"test_config" these days.  It would be a good approach to first do a
preparatory patch to convert the existing ones to use "test_config"
and then to redo this patch using "test_config" on top of it.