All of lore.kernel.org
 help / color / mirror / Atom feed
From: John Keeping <john@keeping.me.uk>
To: Junio C Hamano <gitster@pobox.com>
Cc: David Aguilar <davvid@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH v2 0/4] Auto-generate mergetool lists
Date: Mon, 28 Jan 2013 22:21:47 +0000	[thread overview]
Message-ID: <20130128222147.GD7498@serenity.lan> (raw)
In-Reply-To: <7vk3qxugdg.fsf@alter.siamese.dyndns.org>

On Mon, Jan 28, 2013 at 01:50:19PM -0800, Junio C Hamano wrote:
> What are the situations where a valid user-defined tools is
> unavailable, by the way?

The same as a built-in tool: the command isn't available.

Currently I'm extracting the command word using:

    cmd=$(eval -- "set -- $(git config mergetool.$tool.cmd); echo \"$1\"")

(it's slightly more complicated due to handling difftool.$tool.cmd as
well, but that's essentially it).  Then it just uses the same "type
$cmd" test as for built-in tools.

I don't know if there's a better way to extract the first word, but
that's the best I've come up with so far.


John

  reply	other threads:[~2013-01-28 22:22 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-28  0:52 [PATCH v2 0/4] Auto-generate mergetool lists David Aguilar
2013-01-28  0:52 ` [PATCH v2 1/4] mergetool--lib: Simplify command expressions David Aguilar
2013-01-28  0:52   ` [PATCH v2 2/4] mergetool--lib: Improve the help text in guess_merge_tool() David Aguilar
2013-01-28  0:52     ` [PATCH v2 3/4] mergetool--lib: Add functions for finding available tools David Aguilar
2013-01-28  0:52       ` [PATCH v2 4/4] doc: Generate a list of valid merge tools David Aguilar
2013-01-28  2:14         ` Junio C Hamano
2013-01-28 19:37       ` [PATCH v2 3/4] mergetool--lib: Add functions for finding available tools John Keeping
2013-01-28 20:36         ` Junio C Hamano
2013-01-29 19:48       ` John Keeping
2013-01-29 20:22         ` Junio C Hamano
2013-01-29 22:27           ` David Aguilar
2013-01-29 22:55             ` Junio C Hamano
2013-01-29 23:06               ` John Keeping
2013-01-30  3:08                 ` Junio C Hamano
2013-01-30  3:34                   ` Junio C Hamano
2013-01-29 23:02             ` John Keeping
2013-01-29 19:22   ` [PATCH v2 1/4] mergetool--lib: Simplify command expressions John Keeping
2013-01-29 22:09     ` David Aguilar
2013-01-29 22:27       ` Junio C Hamano
2013-01-30  6:20         ` [PATCH v3 1/4] mergetool--lib: simplify " David Aguilar
2013-01-30  7:04           ` Junio C Hamano
2013-01-28  2:08 ` [PATCH v2 0/4] Auto-generate mergetool lists Junio C Hamano
2013-01-28  2:21   ` David Aguilar
2013-01-28  2:27     ` Junio C Hamano
2013-01-28  2:41       ` David Aguilar
2013-01-28  2:53         ` Junio C Hamano
2013-01-28 21:01         ` John Keeping
2013-01-28 21:50           ` Junio C Hamano
2013-01-28 22:21             ` John Keeping [this message]
2013-01-29 11:56               ` Joachim Schmitz
2013-01-29 12:09                 ` John Keeping
2013-01-29 16:15                   ` Junio C Hamano
2013-01-29 16:46                     ` John Keeping
2013-01-28  8:20 ` Philip Oakley
2013-01-28  9:16   ` David Aguilar
2013-01-28 21:19     ` Philip Oakley

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

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

  git send-email \
    --in-reply-to=20130128222147.GD7498@serenity.lan \
    --to=john@keeping.me.uk \
    --cc=davvid@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.