From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: Checking in files with trailing white space Date: Sun, 11 Dec 2016 19:50:13 +0100 Message-ID: References: <20161211133110.GB14084@acm.fritz.box> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1481482229 11146 195.159.176.226 (11 Dec 2016 18:50:29 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 11 Dec 2016 18:50:29 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) Cc: emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Dec 11 19:50:25 2016 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 1cG9Ca-0002Ei-St for ged-emacs-devel@m.gmane.org; Sun, 11 Dec 2016 19:50:24 +0100 Original-Received: from localhost ([::1]:56805 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cG9Cf-0006Bi-6M for ged-emacs-devel@m.gmane.org; Sun, 11 Dec 2016 13:50:29 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cG9CY-0006Bc-EN for emacs-devel@gnu.org; Sun, 11 Dec 2016 13:50:23 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cG9CV-0001LJ-EQ for emacs-devel@gnu.org; Sun, 11 Dec 2016 13:50:22 -0500 Original-Received: from hermes.netfonds.no ([80.91.224.195]:57267) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cG9CV-0001Kq-6D for emacs-devel@gnu.org; Sun, 11 Dec 2016 13:50:19 -0500 Original-Received: from cm-84.215.1.64.getinternet.no ([84.215.1.64] helo=stories) by hermes.netfonds.no with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1cG9CP-0007F1-Qx; Sun, 11 Dec 2016 19:50:18 +0100 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAFVBMVEViMj5/T0TRsoqvfFRK FCL7/Pru5tYKTK/7AAACQUlEQVQ4jU2SwXLrIAxFRcJ0jUKn6waPvTamzZrO8xfkjVjX9sD/f0Il cJzICxsd6QrDBeo89LSoIZeSU7rqnj7VlAloDeaNaOFvie6NVrADMUidj0NJ/KzTQJnSIg0MuOVd cWoFY2Ei2sDeqAJu0apPIS/9du7pS4W+AZlyykum8YOuNxptyDtIHZaicoITLRda7EQHsMP1PG1o nT/l/3g7QPhYx/O/u3OrMn3C6ZAK3w7gzMvNwAf5J/D9BiAKIfCc6+UB7j4vUeHEFV6AfYKygK0A 4ZRfAf2CdNw9xhN9PsGYFlA+DJu38VReQVkBPIaAPLyMz+Ffl8TbRY4R3go8wfhTRvjxiBZgWH5e /iPeFpgNGoiQf1U7K6EdjwSYQUc43Q0OFRQm3bsaFklHPn6wfQWDgC+4lE8G83eqThDguHHzYG6b iTr2K7QRDIoc7zuo4OyVL4Qtkg/A3tIAzlxMhHYblKqU+GEGgDhHDHVPKbUO8cMsoayTBnYZA9kw E9SgMUwtnwtMD9IFDteMyq5k4Cqg4jhanv3tIAihtm4vri+rA8tk2MkeXO8C8PU8xI6G1YUKwiFW Y3WuE2ArGfKhswNVSZgGlkucZv1uB4iVsF6peSdLD9HMjbDe6iZ+QgPzrDV32SCKVVXSiNDOToC3 iG1gwAeIu9pezw2mgZkvCK3lFoNYnfcE8kM8yxhUBpTRDxDrvtlzRim+SzbZASSvgLNcrQ8w61kZ KWUdo3l1gFk+ZZLogNavQBjnuElc/AdTuPi2Cs6feQAAAABJRU5ErkJggg== In-Reply-To: <20161211133110.GB14084@acm.fritz.box> (Alan Mackenzie's message of "Sun, 11 Dec 2016 13:31:10 +0000") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 80.91.224.195 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:210301 Archived-At: Alan Mackenzie writes: >> > I'm adding test cases for the shr HTML rendering, and in some of the >> > tests there should really be trailing white space in the result files. >> > Is there a way to say that the test/data/shr directory should be allowed >> > to have trailing spaces in our git/checkin thing? > >> Never mind; found it... > > Would some kind soul please tell me the recipe. I've just merged master > into a nine-month old branch, and I get lots of these whitespace errors > when I try to commit the merge. Hm... sorry, I've forgotten again. But I don't think what you're seeing is related to what I was talking about. The git/checkin script refuses to check in files with whitespace at the end of lines, while it sounds like you have something different going on... -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no