All of lore.kernel.org
 help / color / mirror / Atom feed
From: Theodore Tso <tytso@MIT.EDU>
To: Steffen Prohaska <prohaska@zib.de>
Cc: Junio C Hamano <gitster@pobox.com>,
	Charles Bailey <charles@hashpling.org>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: [RFC/PATCH] Teach git mergetool to use custom commands defined at config time
Date: Sun, 17 Feb 2008 16:49:42 -0500	[thread overview]
Message-ID: <20080217214942.GJ8905@mit.edu> (raw)
In-Reply-To: <FBA2E61E-5CAF-49E3-A917-ACDD10586928@zib.de>

On Sun, Feb 17, 2008 at 08:59:31AM +0100, Steffen Prohaska wrote:
>
> I am not upset at all and I really appreciate Charles work for
> adding a generic mechanism.  I was just wondering why not taking
> the direct way of adding tools to git-mergetool one by one until
> we eventually have a rather complete list of supported tools.
> This would be the easiest solution for end users if their
> preferred tool is supported.  It is also easier to add support
> for a specific tool than a generic mechanism.

I have no objection to a generic mechanism, but I don't see the value
of Charles suggestion to rip out support for the existing tools
supported by git-mergetool.

I think it *would* be better to use %(foo) extrapolation that
environment variables, so that it's not required for users to write
shell scripts unless absolutely necessary.

When we get around to rewriting git-mergetool in C, it might make
sense to put the tool support in the various shell scripts that are
installed in the git helper binary directory (i.e.,
git-mergetool-kdiff3, git-mergetool-meld, etc.)  That would make it
easier for users to create new shell scripts to support new tools if
necessary.

					- Ted

  parent reply	other threads:[~2008-02-17 21:51 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-16 18:53 [RFC/PATCH] Teach git mergetool to use custom commands defined at config time Charles Bailey
2008-02-16 20:04 ` Junio C Hamano
2008-02-16 20:20   ` Charles Bailey
2008-02-16 21:11 ` Jakub Narebski
2008-02-16 22:37 ` Steffen Prohaska
2008-02-17  0:20   ` Charles Bailey
2008-02-17  0:46     ` Johannes Schindelin
2008-02-17  0:56       ` Charles Bailey
2008-02-17  1:15         ` Junio C Hamano
2008-02-17  7:59           ` Steffen Prohaska
2008-02-17 10:15             ` Charles Bailey
2008-02-17 21:49             ` Theodore Tso [this message]
2008-02-17 23:28               ` Charles Bailey
2008-02-17 23:41               ` Charles Bailey
2008-02-18  0:30               ` Junio C Hamano
2008-02-18  8:14                 ` Charles Bailey

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=20080217214942.GJ8905@mit.edu \
    --to=tytso@mit.edu \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=charles@hashpling.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=prohaska@zib.de \
    /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.