From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.bugs Subject: bug#29197: 27.0.50; pre-commit checks for new files against "head" Date: Tue, 7 Nov 2017 16:36:37 -0500 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Trace: blaine.gmane.org 1510090633 578 195.159.176.226 (7 Nov 2017 21:37:13 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 7 Nov 2017 21:37:13 +0000 (UTC) Cc: 29197@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Nov 07 22:37:08 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1eCBYR-0008MJ-Eh for geb-bug-gnu-emacs@m.gmane.org; Tue, 07 Nov 2017 22:37:07 +0100 Original-Received: from localhost ([::1]:55945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCBYY-0001hs-Fq for geb-bug-gnu-emacs@m.gmane.org; Tue, 07 Nov 2017 16:37:14 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49445) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCBYP-0001hm-Qa for bug-gnu-emacs@gnu.org; Tue, 07 Nov 2017 16:37:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCBYM-0004P7-Mu for bug-gnu-emacs@gnu.org; Tue, 07 Nov 2017 16:37:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:48482) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eCBYM-0004Op-IY for bug-gnu-emacs@gnu.org; Tue, 07 Nov 2017 16:37:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eCBYM-0000fM-1C for bug-gnu-emacs@gnu.org; Tue, 07 Nov 2017 16:37:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Noam Postavsky Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 07 Nov 2017 21:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 29197 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 29197-submit@debbugs.gnu.org id=B29197.15100906052532 (code B ref 29197); Tue, 07 Nov 2017 21:37:01 +0000 Original-Received: (at 29197) by debbugs.gnu.org; 7 Nov 2017 21:36:45 +0000 Original-Received: from localhost ([127.0.0.1]:57163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eCBY5-0000em-4T for submit@debbugs.gnu.org; Tue, 07 Nov 2017 16:36:45 -0500 Original-Received: from mail-wm0-f51.google.com ([74.125.82.51]:52831) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eCBY3-0000eY-Hm for 29197@debbugs.gnu.org; Tue, 07 Nov 2017 16:36:43 -0500 Original-Received: by mail-wm0-f51.google.com with SMTP id t139so6889446wmt.1 for <29197@debbugs.gnu.org>; Tue, 07 Nov 2017 13:36:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=OOhSdDZN7Wxbe5pFKSEiPx3kiqbBkAsg1Pz3l+gZS2w=; b=o7eoNGrbTCpTTEfWmzWc9gsJY8ecQdH682Udf3pHg4ALvdI6zRwPtcVIuvtYL5OB+M iIjFTz+9OnB0rVQ03Kcz4lAC8wFixqMR8DxpGpyFsSIP7XQtQejvZREkVXZrywPF0I71 0hl0kJ9QpjIqCeTgz6kZ9Ye+bjLz+4dJ32zr+tORSNVtUAXhKUQ2kGE4paouxqtaLbFv d5nqdwd+AckSOtxQscV1j4X1ChBL7/v+ZD/ipH2WixFG42uhOoXG8kYrYosGaZHVEuGz wwxlhq0Njx+mXjgQphYg0/zmzWHWYwmdx+4L5+gFPtadnLBcsRw2dFHYYBBGImNEMK12 F8kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=OOhSdDZN7Wxbe5pFKSEiPx3kiqbBkAsg1Pz3l+gZS2w=; b=AqpG3iNKiSQYo2GckpMsDG8RoXEu/W6iFMrz6JGd6sxZY/HZpXp5U9B0IA6r7Bks7g AuqX4QQf86GQgVmZeilTnlN/6rUo232wrtou/ZYwj+Lf/VJ/TRreUZpA6befZu7rSkH2 uztdBKVO+fpW0ce9YEwF+OGwbexvg5r3+WcL8zC4N8y5pGWYNrXcc5/0vV++oNegW3ZE 7ePMhWoa2FODLk5gCG371TwmhNFh90w0tZuFwYFHK4zWlvIxLQ4miPfcZqcr5jnENAjQ gvANn3mB+wDRnFQyE9DVA1qgEMAb0pCOan0yG2BMBoLTW/I//F496hS5apW74Rweb54b GewA== X-Gm-Message-State: AJaThX5WLeeLXgybD5WIVTfJI2HfRHCzKkG80PQ99txbaEKi+d1uUCL/ 4hg9F8iL3wIdVqHRbOqcEs7vcYEjeLIPNtje6Vs= X-Google-Smtp-Source: ABhQp+Sppt3HCe3mnsJ3l5NspvPJMONm0hVIrvbYbDqmfIrlHx+MqsYkXYCFJQu6pGWwN3HynXtsypdv0VcHjoae+LA= X-Received: by 10.28.113.212 with SMTP id d81mr450682wmi.152.1510090597583; Tue, 07 Nov 2017 13:36:37 -0800 (PST) Original-Received: by 10.223.146.227 with HTTP; Tue, 7 Nov 2017 13:36:37 -0800 (PST) In-Reply-To: X-Google-Sender-Auth: 6dYIHlVimmuJHnynejZt75jX49E X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:139582 Archived-At: On Tue, Nov 7, 2017 at 2:18 PM, Stefan Monnier wrote: > I finally figured out why recently, every time I merge changes from > master into my local branch it complains: > > File name does not consist of -+./_ or ASCII letters or digits. > > It turns out it's because it's looking at the diff between master and my > local (merged) branch (i.e. it looks at my local changes) whereas before > it would look at the diff between the old version of my local branch and > the merged version of my local branch (i.e. at the changes I'm pulling > from master). See [1] and followups. Getting warnings about other people's changes was causing some confusion and frustration. [1]: https://lists.gnu.org/archive/html/emacs-devel/2017-04/msg00299.html > And yes, indeed, my local branch has some files with "weird" chars > in it. > > I think the warning should be improved: > - I shouldn't get a warning in the above case, since this commit doesn't > *add* those files (they weren't on origin/master admittedly but they were > already on HEAD). We could choose which side of the merge to check based on an environment var (that was considered in the thread I referenced above, but we didn't see much of a use case at the time). Or is it possible to check only changes from the merge itself (i.e., in case of conflict resolution)? > - the warning should give me some hint about which file fails the test. Yeah, that would make sense.