Re: [PATCH 1/3] Add --gui option to mergetool

From: Rémi Galan Alfonso <remi.galanalfonso@gmail.com>
Date: Mar 3, 2017, 18:06 UTC
Message-ID: <cc53dc5b-4f3a-bb7f-4f4f-876ba6adb31f@gmail.com>
In-Reply-To: <20170303115738.GA13211@arch-attack.localdomain>

Hi,

Denton Liu <liu.denton@gmail.com> writes:
 > [...]
 >
 > +test_expect_success 'gui mergetool' '
 > +	test_when_finished "git reset --hard" &&
 > +	test_when_finished "git config merge.tool mytool" &&
 > +	test_when_finished "git config --unset merge.guitool" &&
 > +	git config merge.tool badtool &&
 > +	git config merge.guitool mytool &&

You should be able to squash the lines
   `test_when_finished "git config --unset merge.guitool" &&`
and
   `git config merge.guitool mytool &&`
into
   `test_config merge.guitool mytool`

(It is however not possible with merge.tool since you set it to a specific value 'when_finished')

Thanks, Rémi