From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Michal Nazarewicz Newsgroups: gmane.emacs.devel Subject: Re: master has switched from Automake to GNU Make Date: Tue, 11 Apr 2017 18:21:01 +0200 Organization: http://mina86.com/ Message-ID: 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> <58ECE005.7050301@gmx.at> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1491927731 3637 195.159.176.226 (11 Apr 2017 16:22:11 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 11 Apr 2017 16:22:11 +0000 (UTC) Cc: Paul Eggert , emacs-devel To: martin rudalics , Noam Postavsky Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 11 18:22:05 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 1cxyYN-0000mb-HN for ged-emacs-devel@m.gmane.org; Tue, 11 Apr 2017 18:22:03 +0200 Original-Received: from localhost ([::1]:40177 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxyYT-0001Kk-H8 for ged-emacs-devel@m.gmane.org; Tue, 11 Apr 2017 12:22:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:32780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxyXT-00013q-5c for emacs-devel@gnu.org; Tue, 11 Apr 2017 12:21:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxyXS-0008Hh-9k for emacs-devel@gnu.org; Tue, 11 Apr 2017 12:21:07 -0400 Original-Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]:35516) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cxyXR-0008H3-Vk for emacs-devel@gnu.org; Tue, 11 Apr 2017 12:21:06 -0400 Original-Received: by mail-wm0-x234.google.com with SMTP id w64so68037314wma.0 for ; Tue, 11 Apr 2017 09:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:cc:subject:in-reply-to:organization:references:face :openpgp:date:message-id:mime-version:content-transfer-encoding; bh=SWaRbUARpEZOmBRGTqQL8V9aKV490WTeQiKP/iJfsic=; b=oVTv0WKvpACgy+RLGV5V8OggT+Y7Xb1af3BMV8gRHfLYBJ/vzzofzmyeiGJginFIs8 CLBecdM9bKCBCcaxDFS9qfQpm0JrhpqWvAOZqntKZtiO650iBGjQGwgzEGEREoy4ia48 Ee9r6bAzjM6/4rxqIxD9QcryVnpg4WA5vl/HcUOUlqoeyb31y3OJQ/J5qonUbzlWhWEp KuixxU1W1lDqVpNEAz1pBm7CC6FErZ7ckSIZk+P8wkE7/NoYUJwzm/cC8lShINGM0xmy qhbwQsZf84MmOQizwqLyhgz5Qqlt0kE6QAdWcdn6tbnWktHErdRb4VKvDulFb3QdH7tf HmgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:in-reply-to :organization:references:face:openpgp:date:message-id:mime-version :content-transfer-encoding; bh=SWaRbUARpEZOmBRGTqQL8V9aKV490WTeQiKP/iJfsic=; b=T/KVLN9RJkohDREiR1yQNUPNc7TS37Q4hxXrIUtjsKXM/NzhRAyHmT3vW6HLF3eTsT +U5KISFvJkrQ6UWCKB0wmRA2sZyN74amJMxFY05RLa83yYxmQAVwmoSdpEbZTi40sVnh aa8bC8fNuoeMehfeM0GGI5LhJMFuaJewwuSzaupc+4vbIk1FQo4F9IoqBHX4lN004Dz5 MC1iot9xfXYtyT4nMMxzjAH5RaeU8h4k9xyI38HORY3wJwGCnZqj6zX2UVeNYNBXpTXy 33W6V1ediH2SvGrNToWbkVflL/btdtIf41dJ77EC9y8fvSQshmmDryLUrW0TqssW0e3S dklg== X-Gm-Message-State: AN3rC/5nknTvwKx05xiknaQ7HtNLy+kr/aNWPNgqL1fHCUMREV6XLI0d JHSa5Na4EQTPzvB7 X-Received: by 10.28.63.22 with SMTP id m22mr16421915wma.142.1491927663180; Tue, 11 Apr 2017 09:21:03 -0700 (PDT) Original-Received: from mpn-glaptop ([2620:0:105f:303:9c26:d542:81a3:cc07]) by smtp.gmail.com with ESMTPSA id d17sm3060603wmi.21.2017.04.11.09.21.02 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 11 Apr 2017 09:21:02 -0700 (PDT) In-Reply-To: <58ECE005.7050301@gmx.at> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJFBMVEWbfGlUPDDHgE57V0jUupKjgIObY0PLrom9mH4dFRK4gmjPs41MxjOgAAACP0lEQVQ4T23Sv2vbQBQHcBk1xE6WyALX107VUEgmn6+ouUwpEQQ6uRjttkWP4CkBg2M0BQLBdPFZYPsyFYo7qEtKDQ7on+t7+nF2Ux8ahD587717OmNYrOvycHsZ+o2r051wHTHysAvGb8ygvgu4QWT0sCmkgZCIEnlV2X8BtyraazFGDuxhmKSQJMlwHQ7v5MHSNxmz78rfElwAa3ieVD9e+hBhjaPDDG6NgFo2f4wBMNIo5YmRtF0RyDgFjJjlMIWbnuM4x9MMfABGTlN4qgIQB4A1DEyA1BHWtfeWNUMwiVJKoqh97KrkOO+qzgluVYLvFCUKAX73nONeBr7BGMdM6Sg0kuep03VywLaIzRiVr+GAzKlpQIsAFnWAG2e6DT5WmWDiudZMIc6hYrMOmeMQK9WX0B+/RfjzL9DI7Y9/Iayn29Ci0r2i4f9gMimMSZLCDMalgQGU5hnUtqAN0OGvEmO1Wnl0C0wWSCEHnuHBqmygxdxA8oWXwbipoc1EoNR9DqOpBpOJrnr0criQab9ZT4LL+wI+K7GBQH30CrhUruilgP9DRTrhVWZCiAyILP+wiuLeCKGTD6r/nc8LOJcAwR6IBTUs+7CASw3QFZ0MdA2PI3zNziH4ZKVhXCRMBjeZ1DWMekKwDCASwExy+NQ86TaykaDAFHO4aP48y4 fIcDM5yOG8GcTLbOyp8A8azjJI93JFd1EA6yN8sSxMQJWoABqniRZVykYgRXErzrdqExAoUrRb0xfRp8p2A/4XmfilTtkDZ4cAAAAASUVORK5CYII= X-Face: -TR8(rDTHy/(xl?SfWd1|3:TTgDIatE^t'vop%*gVg[kn$t{EpK(P"VQ=~T2#ysNmJKN$"yTRLB4YQs$4{[.]Fc1)*O]3+XO^oXM>Q#b^ix, O)Zbn)q[y06$`e3?C)`CwR9y5riE=fv^X@x$y?D:XO6L&x4f-}}I4=VRNwiA^t1-ZrVK^07.Pi/57c_du'& OpenPGP: id=AC1F5F5CD41888F8CC8458582060401250751FF4; url=http://mina86.com/mina86.pub X-Hashcash: 1:20:170411:npostavs@users.sourceforge.net::9lL89DvkuDv7deHz:000000000000000000000000000000003H9 X-Hashcash: 1:20:170411:rudalics@gmx.at::m+CPOJOADntdcF+t:003j+0 X-Hashcash: 1:20:170411:emacs-devel@gnu.org::qAkGWcnbW34yxEf4:00000000000000000000000000000000000000000050v6 X-Hashcash: 1:20:170411:eggert@cs.ucla.edu::mpcs5cTgD44Z0c3k:00000000000000000000000000000000000000000006zmK X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::234 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:213870 Archived-At: On Tue, Apr 11 2017, martin rudalics wrote: > > If you merge that commit or any child of it *with* > > conflicts (the conflicts can be unrelated) then the whitespace check > > is triggered when you commit the resolution. > > I have definitively encountered this case before too. > > > Furthermore, I believe the whitespace check is only installed if you > > run './autogen git' or './autogen all'. If you just plain './autogen' > > then the git hooks are not installed. > > I always run './autogen.sh' because IIRC that is (or at least was) the > recommended way. > > > I guess most people are rebasing instead of merging or didn't install > > the git hooks and hence don't see this kind of failure. > > I never rebase. Whether and how I installed the hooks is beyond my > knowledge. But IIUC Michael who committed the changes in > SpecialCasing.txt did not install the hook. $ ll .git/hooks/ total 16 -rwx------ 1 mpn eng 452 Dec 3 2014 applypatch-msg* -rwx------ 1 mpn eng 4002 Jan 28 2016 commit-msg* -rwx------ 1 mpn eng 398 Dec 3 2014 pre-applypatch* -rwx------ 1 mpn eng 1419 Jul 27 2016 pre-commit* $ grep -ve ^# -e ^\$ .git/hooks/pre-commit=20 LC_ALL=3DC export LC_ALL exec >&2 . git-sh-setup git_diff=3D'git diff --cached --name-only --diff-filter=3DA' ok_chars=3D'\0+[=3D-=3D]./0-9A-Z_a-z' nbadchars=3D`$git_diff -z HEAD | tr -d "$ok_chars" | wc -c` if test "$nbadchars" -ne 0; then echo "File name does not consist of -+./_ or ASCII letters or digits." exit 1 fi for new_name in `$git_diff HEAD`; do case $new_name in -* | */-*) echo "$new_name: File name component begins with '-'." exit 1;; ChangeLog | */ChangeLog) echo "$new_name: Please use git commit messages, not ChangeLog files." exit 1;; esac done $ grep -ve ^# -e ^\$ .git/hooks/pre-applypatch=20 . git-sh-setup test -x "$GIT_DIR/hooks/pre-commit" && exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} : I cannot confirm that those were there when I was pushing SpecialCasing.txt but my guess would be yes. --=20 Best regards =E3=83=9F=E3=83=8F=E3=82=A6 =E2=80=9C=F0=9D=93=B6=F0=9D=93=B2=F0=9D=93=B7= =F0=9D=93=AA86=E2=80=9D =E3=83=8A=E3=82=B6=E3=83=AC=E3=83=B4=E3=82=A4=E3=83= =84 =C2=ABIf at first you don=E2=80=99t succeed, give up skydiving=C2=BB