From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.5 required=3.0 tests=BAYES_00,BODY_8BITS, DC_PNG_UNO_LARGO,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 5E2DD1F404 for ; Tue, 28 Aug 2018 15:57:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727144AbeH1Ttn (ORCPT ); Tue, 28 Aug 2018 15:49:43 -0400 Received: from lb2-smtp-cloud9.xs4all.net ([194.109.24.26]:50707 "EHLO lb2-smtp-cloud9.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727098AbeH1Ttn (ORCPT ); Tue, 28 Aug 2018 15:49:43 -0400 Received: from pc09.procura.nl ([188.202.26.81]) by smtp-cloud9.xs4all.net with ESMTPSA id ugMpfghAMZvhiugMqfQBLA; Tue, 28 Aug 2018 17:57:20 +0200 Date: Tue, 28 Aug 2018 17:57:11 +0200 From: "H.Merijn Brand" To: git@vger.kernel.org Subject: Feature request: be able to pass arguments to difftool command Message-ID: <20180828175711.3a0aeacc@pc09.procura.nl> X-Mailer: Claws Mail 3.16.0git170 (GTK+ 2.24.31; x86_64-suse-linux-gnu) Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwEAIAAACI8LKTAAAACXBIWXMAAABIAAAASABGyWs+AAAC JElEQVRo3u2aMY4CMQxFczZ6RItEzRm4DBINDbRUSPRInIRbsNK6+dJfezN4kokn48IaCSjysL8d e9Knoj2fr9f9/gllqQ6U9/vxWK3EdwdIEGjRIVCu18NhuxUfK46SH81+fzrdbuKPx/P5ctHQdAdI TKAgpvV6s9ntBEfXEYSGgMQzIHnuFBBjkshCNJ2KtJZ04hHNAugP8bZr3NIHhbcF0AKoK0CoaHXU LUWBIs1n+jV+Fl8CVqOApEXAwyMO/DSR4XVntoAYDR7eBjQupuYAYTMph8Rj21D4m7MChN02tpqs NSnb/KqU2oHCXu5xDCgflj/RAgBiKBIXnICzAsSjWBsTz5K4/HeXYvb8yK5lY3VGEwPi2aONKT+5 AlcxrTPOwcTiraGRChgMEKJh0bVVifGVTq6qgBiNVl8QE29EsK6VE+YJAOG2wz5AvsqUS6uqgHCA n4NGvBYpnJ64Jgg27sCtxtBk1CJIA4S/GhdWKh07QxUB48jWGhZ4jKamRRr/T8/M0AaEyctry6YB 4dTGj9iWZNs3DahES5kPCJOu0RQbF/fQOBprsB9gaO9JtPDzII9U5ySXX7AnuIt91y54AAW7rPpT LCe5gt3F+CLqr2UarGB3MXvMylWGq4+9RCx3TW1oJq1t3HPQlFs6N1fFNEB4s8dn7Ne7ACSm7TPQ I5quAWmw6qBpulHM33B0Csge4Nd8JTTYG2b1XyRe3lH8x34ABJ6aePuQ2N4AAAAASUVORK5CYII= MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/Qm_/BPxrc7IDCUn2Doc2xIa"; protocol="application/pgp-signature" X-CMAE-Envelope: MS4wfCXjTWsuZxvfcRmpsRMCzie/jS6VZ43e0eXMUQZjvAUQFVUDUg0Q+fWow7cWIOKAYGD90oG5T3hxxkbWy4pBRPm/TKfetC2wStyfOHLS/HB0Oae+3i0J +e2CIOjAvFGWQt8ZK4PfnWkDGxFpfuga+xIukM5Y9nrgybkDNGQvvcmx Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org --Sig_/Qm_/BPxrc7IDCUn2Doc2xIa Content-Type: multipart/mixed; boundary="MP_/e.sJ81ZFG92Sxze1IkKwPp7" --MP_/e.sJ81ZFG92Sxze1IkKwPp7 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline In short, I want to be able to do $ git difftool 5c5a -v2 where -v2 is passed to the tool invoked in the end. I'll elaborate on why ... Background. Some changes are not obvious to spot. One of the best examples I found is this one: https://github.com/hexchat/hexchat/commit/5c5aacd9da7d45dfc1644b87de9e2379a= 1102d6a $ git show 5c5a commit 5c5aacd9da7d45dfc1644b87de9e2379a1102d6a Author: Patrick Griffis Date: Wed Apr 4 19:21:53 2018 -0400 Fix another bad translation diff --git a/po/el.po b/po/el.po index 7d47ee1e..e54d62c1 100644 --- a/po/el.po +++ b/po/el.po @@ -1072,7 +1072,7 @@ msgstr "%C22*%O$t%C22$1%O: %C18$2%O =CE=BA=CE=B1=CF= =84=CE=AC =CF=83=CF=85=CE=BD=CE=AD=CF=87=CE=B5=CE=B9=CE=B1 %C24$4%O =CE=B1= =CF=80=CF=8C %C #: src/common/textevents.h:13 msgid "%C22*%O$tCannot join %C22$1 %O(%C20You are banned%O)." -msgstr "%C22*%O$t=CE=91=CE=B4=CF=85=CE=BD=CE=B1=CE=BC=CE=AF=CE=B1 =CE=B5= =CE=B9=CF=83=CE=B1=CE=B3=CF=89=CE=B3=CE=AE=CF=82 %C22$1 %O(%C20=CE=95=CE=AF= =CF=83=CF=84=CE=B5 =CE=BC=CF=80=CE=BB=CE=BF=CE=BA=CE=B1=CF=81=CE=B9=CF=83= =CE=BC=CE=AD=CE=BD=CE=BF=CF=82%=CE=9F)." +msgstr "%C22*%O$t=CE=91=CE=B4=CF=85=CE=BD=CE=B1=CE=BC=CE=AF=CE=B1 =CE=B5= =CE=B9=CF=83=CE=B1=CE=B3=CF=89=CE=B3=CE=AE=CF=82 %C22$1 %O(%C20=CE=95=CE=AF= =CF=83=CF=84=CE=B5 =CE=BC=CF=80=CE=BB=CE=BF=CE=BA=CE=B1=CF=81=CE=B9=CF=83= =CE=BC=CE=AD=CE=BD=CE=BF=CF=82%O)." #: src/common/textevents.h:19 msgid "%C29*%O$tCapabilities acknowledged: %C29$2%O" I bet none of you is able to spot the change in that line, even if colored. I had a similar problem completely unrelated to git, and I wrote the "ccdiff" tool, to do horizontally colored diff. As mail (when used without HTML, as it ought to be used) is not apt to coloring, I added an option to show markers under the changed text. I then integrated the tool as much as possible into git $ cpan App::ccdiff $ git config --global diff.tool ccdiff $ git config --global difftool.prompt false $ git config --global difftool.ccdiff.cmd 'ccdiff --utf-8 -u $LOCAL $REMOT= E' $ git difftool 5c5a~..5c5a --- /tmp/CXbTje_el.po Tue Aug 28 17:38:02 2018 +++ /tmp/8jrR7d_el.po Tue Aug 28 17:38:02 2018 1075,1075c1075,1075 #: src/common/textevents.h:13 msgid "%C22*%O$tCannot join %C22$1 %O(%C20You are banned%O)." -msgstr "%C22*%O$t=CE=91=CE=B4=CF=85=CE=BD=CE=B1=CE=BC=CE=AF=CE=B1 =CE=B5= =CE=B9=CF=83=CE=B1=CE=B3=CF=89=CE=B3=CE=AE=CF=82 %C22$1 %O(%C20=CE=95=CE=AF= =CF=83=CF=84=CE=B5 =CE=BC=CF=80=CE=BB=CE=BF=CE=BA=CE=B1=CF=81=CE=B9=CF=83= =CE=BC=CE=AD=CE=BD=CE=BF=CF=82%=CE=9F)." +msgstr "%C22*%O$t=CE=91=CE=B4=CF=85=CE=BD=CE=B1=CE=BC=CE=AF=CE=B1 =CE=B5= =CE=B9=CF=83=CE=B1=CE=B3=CF=89=CE=B3=CE=AE=CF=82 %C22$1 %O(%C20=CE=95=CE=AF= =CF=83=CF=84=CE=B5 =CE=BC=CF=80=CE=BB=CE=BF=CE=BA=CE=B1=CF=81=CE=B9=CF=83= =CE=BC=CE=AD=CE=BD=CE=BF=CF=82%O)." #: src/common/textevents.h:19 msgid "%C29*%O$tCapabilities acknowledged: %C29$2%O" $ cat >~/bin/git-ccdiff <