From: Junio C Hamano <gitster@pobox.com>
To: Theodore Tso <tytso@mit.edu>
Cc: Patrick.Higgins@cexp.com, gitster@pobox.com, git@vger.kernel.org
Subject: Re: [PATCH] Added mergetool.kdiff3.doubledash config option
Date: Fri, 13 Jun 2008 23:17:51 -0700 [thread overview]
Message-ID: <7vhcbwilps.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080613145803.GE24675@mit.edu> (Theodore Tso's message of "Fri, 13 Jun 2008 10:58:03 -0400")
Theodore Tso <tytso@mit.edu> writes:
> On Thu, Jun 12, 2008 at 04:44:03PM -0600, Patrick.Higgins@cexp.com wrote:
>> I have found the following to be a way to distinguish the two
>> versions based solely on exit status. The broken one exits with 255.
>>
>> kdiff3 --auto -o /dev/null -- /dev/null /dev/null
>>
>> I'll work up another patch that uses this. This check adds about
>> 0.5s overhead. That seems a little high to me, but given that
>> mergetool is interactive, I guess that could be acceptable.
>
> Hmm, do we have a policy about whether or not it is acceptable to
> modify .gitconfig behind the user's back? It would be nice if the
> check would be done once and then the result gets cached. So if not
> in .gitconfig, maybe somewhere else.
The reason I suggested either a cheap runtime check or command line
override was because you can be accessing the same repository from two
different machines, with different kdiff3. If you check once and store
the result in .gitconfig or .git/config, it would not help the situation a
bit, would it?
next prev parent reply other threads:[~2008-06-14 6:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-12 19:55 [PATCH] Added mergetool.kdiff3.doubledash config option Patrick Higgins
2008-06-12 20:36 ` Junio C Hamano
2008-06-12 22:44 ` Patrick.Higgins
2008-06-13 14:58 ` Theodore Tso
2008-06-14 6:17 ` Junio C Hamano [this message]
2008-06-14 6:29 ` Theodore Tso
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=7vhcbwilps.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Patrick.Higgins@cexp.com \
--cc=git@vger.kernel.org \
--cc=tytso@mit.edu \
/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 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 NNTP newsgroup(s).