From: Junio C Hamano <gitster@pobox.com>
To: Patrick Higgins <patrick.higgins@cexp.com>
Cc: git@vger.kernel.org, "Theodore Ts'o" <tytso@mit.edu>
Subject: Re: [PATCH] Added mergetool.kdiff3.doubledash config option
Date: Thu, 12 Jun 2008 13:36:32 -0700 [thread overview]
Message-ID: <7vve0ez8z3.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1213300505-3867-1-git-send-email-patrick.higgins@cexp.com> (Patrick Higgins's message of "Thu, 12 Jun 2008 13:55:05 -0600")
Patrick Higgins <patrick.higgins@cexp.com> writes:
> Qt-only builds of kdiff3 (no KDE) do not support a bare '--' on the command
> line. It will fail silently and mysteriously.
>
> Signed-off-by: Patrick Higgins <patrick.higgins@cexp.com>
Hmm, I am seeing this patch for the first time, I have not seen any
discussion history leading to the patch, and I have not been primarily
involved in mergetool. I'll Cc Ted to see what he thinks...
> +mergetool.kdiff3.doubledash::
> + A boolean to indicate whether or not your kdiff3 supports a '--'
> + on the command line to separate options from filenames. If you
> + built it without KDE, it probably doesn't have this support and
> + you should set this to false. Defaults to true.
The above description makes it clear that there is an issue that needs to
be addressed. I however am wondering if this can be either autodetected
at runtime, or if it can't, the user should be able to specify the option
when the user runs mergetool from the command line. It would be necessary
to countermand whichever choice you configured in your config when you
need to run kdiff3 with KDE from one machine and the one without from
another machine, wouldn't it?
next prev parent reply other threads:[~2008-06-12 20:37 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 [this message]
2008-06-12 22:44 ` Patrick.Higgins
2008-06-13 14:58 ` Theodore Tso
2008-06-14 6:17 ` Junio C Hamano
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=7vve0ez8z3.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=patrick.higgins@cexp.com \
--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).