git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Rémi Galan Alfonso" <remi.galanalfonso@gmail.com>
To: Denton Liu <liu.denton@gmail.com>, git@vger.kernel.org
Cc: davvid@gmail.com, Johannes.Schindelin@gmx.de
Subject: Re: [PATCH 1/3] Add --gui option to mergetool
Date: Fri, 3 Mar 2017 19:06:30 +0100	[thread overview]
Message-ID: <cc53dc5b-4f3a-bb7f-4f4f-876ba6adb31f@gmail.com> (raw)
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


      parent reply	other threads:[~2017-03-03 18:07 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-03 11:57 [PATCH 1/3] Add --gui option to mergetool Denton Liu
2017-03-03 12:39 ` David Aguilar
2017-03-03 18:06 ` Rémi Galan Alfonso [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cc53dc5b-4f3a-bb7f-4f4f-876ba6adb31f@gmail.com \
    --to=remi.galanalfonso@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=davvid@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=liu.denton@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).