From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.devel Subject: Re: master has switched from Automake to GNU Make Date: Wed, 12 Apr 2017 11:30:03 +0200 Message-ID: <58EDF39B.6020205@gmx.at> References: <58CB9F6B.5080806@gmx.at> <83h92sz2j9.fsf@gnu.org> <58CBAEB7.5030601@gmx.at> <58CBBC6C.8000104@gmx.at> <58D380FF.1070103@gmx.at> <58D3C84E.5080808@gmx.at> <58D4E0D6.2070101@gmx.at> <86mvcap85t.fsf@stephe-leake.org> <58D637CD.1020902@gmx.at> <60eced11-9b48-f24d-88d7-cacb211418c9@cs.ucla.edu> <58ECB63C.30003@gmx.at> <58ECDFE6.1060903@gmx.at> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1491989614 10699 195.159.176.226 (12 Apr 2017 09:33:34 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 12 Apr 2017 09:33:34 +0000 (UTC) Cc: Andreas Schwab , Paul Eggert , emacs-devel To: Yuri Khan Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 12 11:33:30 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cyEeX-0002f0-G2 for ged-emacs-devel@m.gmane.org; Wed, 12 Apr 2017 11:33:29 +0200 Original-Received: from localhost ([::1]:43158 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cyEed-0000n2-Fg for ged-emacs-devel@m.gmane.org; Wed, 12 Apr 2017 05:33:35 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cyEbf-0007gU-PS for emacs-devel@gnu.org; Wed, 12 Apr 2017 05:30:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cyEbb-0006nj-RG for emacs-devel@gnu.org; Wed, 12 Apr 2017 05:30:31 -0400 Original-Received: from mout.gmx.net ([212.227.17.22]:62037) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cyEbb-0006nL-G8 for emacs-devel@gnu.org; Wed, 12 Apr 2017 05:30:27 -0400 Original-Received: from [192.168.1.100] ([213.162.68.34]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Lf0M7-1cHQrY0YXv-00qhhm; Wed, 12 Apr 2017 11:30:15 +0200 In-Reply-To: X-Provags-ID: V03:K0:Kdt6dlLkYjFX6SeoLVYyjBWDgmqxMHXuPgpdH9KlEKLXouTjzV3 4MUcsHiPIO2VKVElsmvNRzQqk3v6SumjznVDdf29CSgjOKWNRkP4D9iotErqZsd4iFbzH6k DCsCUyvTom5ZbtRqQgopQWqgh7GuR1PxLtL1bjrswTEFpqjjgSYnjTPUG2SRsssPldZEBrX vwvlzXh557dWwKFMmDywQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:0I0KNx9DWew=:e0b6r7z9MO3kP2Oiw3IypT sETuSlvfvPLE6P0UmW0zHFmJFhgurKIKLTAbZichYAawgIuhdk4kyRboiYhEZw7Q2m348sJoB XmeZIB8Fpl/7zNU7H7ZrT/2k+fPGM/H+84rais6Xps+evVGVMwS1L+gLUI40s+C3OagIClthL hGjdFJcT+nBcPNfl7z2iMLODoCHfW1SSk64OTIYzuY21Bl9MqwC+TS2g/br0+CKQ0/VUQcXyo hgvd9Zx8MrbwSHudiDLex+urNVc93cRf2MmSltUXm/WQvOQkRnKxCJ1DYL8pbrdoUmuwhoqmJ Gf+O9P5GVGNFtqO9Z9vzGKHuxeE+SnMX9EgxpIuS2wVkHtsrbQcsbrI+Z2RzcTb18lrW1SKBL o6J6z94Tw8+voplHMEfII5GSKEAzucT3FH2gshmVFMXQoCkpkyU476X9iApv/N2m1hJRUyCEl +O1qfihNuGqj5+oO6ZHrjqLXMsIL5NMwIFC6+qipFvU62QVGPiUHEgpdvqG0SHqmiSFAgroOn wV6waoNO3GCl9c3MBN3HeT+MRbYdeXQ2nzAQ/h53Awyp9gN3GIt0rkd7V0NVn3cK1kbHoHGwN bS5h0a8bUN5F4dFUjBfaS48W79xmyI8IkGYz8lhm8hPqz+blZGgY7P/R0VizPicOdXvWgvQ0Y Lll5SUZ1tkus4jQwpefkovfmrsvxiIE6mDcyfcBiEsQreL/7o5BnW1vmwPeeSZvPXipWFSHfc jBgFFhYRMoEdXOp/qaWD8Gk/0XIWVQtUaxMawdXhiuP5zXZ+No5ssJl1oEoW2vaHDbZjC94k X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.22 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:213901 Archived-At: > In a capable terminal, Git would start a text editor in which you > could compose a commit message for the merge. But this would not have helped me in the case at hand, I suppose. The whitespace complaint would not have vanished. Right? > Under an Emacs shell > buffer, it can=E2=80=99t, so it defers to you to provide a commit mess= age via > -m or -F. > > It tries first the $GIT_EDITOR variable; > if that is not set, then the core.editor configuration setting; > if that is not set either, then $VISUAL but only if the terminal is no= t dumb; > if it has not yet found anything, then $EDITOR; > and if nothing yet, then it ultimately falls back to "vi", but again > only if the terminal is not dumb. > > (And it detects terminal dumbness by the fact that the $TERM variable > is not set or is set to the string "dumb".) > > As an Emacs user you=E2=80=99d probably want this: > > $ git config --global core.editor emacsclient > > or possibly 'emacsclient -t'. Which might confuse me totally because the Emacs I'm just using for pulling might be another Emacs than the one specified as emacsclient. That's the reason why I have no set $GIT_EDITOR. >> I suppose this could also help me >> with git's help which currently always redirects me to my browsers. > > Browsers? Oh, you=E2=80=99re on Windows. On other systems, git-help us= es > man(1) by default. I forgot. On GNU/Linux it indeed tells me that my terminal is not fully functional and starts paging unless I used tee. > (Seriously, I should configure my Git to show > manuals in the browser.) It's a serious pain for me. >> I have never tried to delve into git's options because I usually get = lost >> in its documentation. > > Git=E2=80=99s manual is like that, yes, unfortunately. The change of v= iewing > tool is unlikely to help much with that. > > But seriously, find some time to read the =E2=80=98git help config=E2=80= =99 page once. > It=E2=80=99s full of useful options and less useful defaults (core.pag= er, > core.editor, and merge.conflictstyle to name just a few). I'll do that in the next days and when there are still issues I'll get back to you (if you don't mind). > Well, I would recommend rebasing, which would solve the > SpecialCasing.txt problem because your rebased branch would start > after the problematic file has been committed. If and when I'm convinced that rebasing doesn't do any harm, I might follow that path. So far the opinions about rebasing are too contradictory for my humble mind. > But if you insist on merging, it=E2=80=99s doable, too. Then I guess y= ou > get a merge conflict, > resolve it, > stage the resolved files, > attempt to commit, > get a whitespace policy violation, > say an expletive of your choice, > see that the violation was not your doing, > optionally confirm that by looking at the history of the problematic > file in the branch you=E2=80=99re merging, > then say =E2=80=9COh well=E2=80=9D and commit bypassing the check. > (You can bypass the check by temporarily commenting out the last line > in .git/hooks/pre-commit or uninstalling that hook altogether.) In one out of 100 cases fixing a conflict will then introduce another trailing whitespace which passes by undetected. martin