From: patrick.higgins@cexp.com Date: Thu, 12 Jun 2008 22:44:03 GMT Subject: RE: [PATCH] Added mergetool.kdiff3.doubledash config option Message-ID: <911589C97062424796D53B625CEC0025E46159@USCOBRMFA-SE-70.northamerica.cexp.com> In-Reply-To: <7vve0ez8z3.fsf@gitster.siamese.dyndns.org> From: Junio C Hamano [mailto:gitster@pobox.com] > Patrick Higgins writes: > > > +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? 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.