From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.devel Subject: Re: Problem committing tests Date: Mon, 29 May 2017 08:18:30 -0400 Message-ID: References: <87wp90ppu7.fsf@rosalinde> <592BC29B.6050507@gmx.at> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Trace: blaine.gmane.org 1496060393 20577 195.159.176.226 (29 May 2017 12:19:53 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 29 May 2017 12:19:53 +0000 (UTC) Cc: Stephen Berman , Emacs developers To: martin rudalics Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon May 29 14:19:49 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 1dFJeH-000590-4b for ged-emacs-devel@m.gmane.org; Mon, 29 May 2017 14:19:49 +0200 Original-Received: from localhost ([::1]:48573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dFJeM-0004Tl-0d for ged-emacs-devel@m.gmane.org; Mon, 29 May 2017 08:19:54 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dFJd2-00049Q-Jj for emacs-devel@gnu.org; Mon, 29 May 2017 08:18:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dFJd1-0003Tx-Iw for emacs-devel@gnu.org; Mon, 29 May 2017 08:18:32 -0400 Original-Received: from mail-oi0-x22b.google.com ([2607:f8b0:4003:c06::22b]:33018) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dFJd1-0003Tt-Ce for emacs-devel@gnu.org; Mon, 29 May 2017 08:18:31 -0400 Original-Received: by mail-oi0-x22b.google.com with SMTP id w10so77066204oif.0 for ; Mon, 29 May 2017 05:18:31 -0700 (PDT) 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=QeXEICZrTohYa9ryOvrvgWR6/d6mQZihUDZHNBi0W40=; b=uPHbtNK4u5H28FkqFK80ABrcfUxPf2Ql8V0zHeHZOpo14RAg9xndB1zYurTazpkNlV w1FPMqm70VqfukI6TS3aol5MTLDWImCx3JcZNr/pjOVleFnupYFx1RkUR3XyLdSySRoR WSeRI3lU6yWpGjQim/xWLSHRB+OhSEazFb4ejwvhDzecVPjiS+nueI2pp+Nr1SuQjlCg lMWZ30X6ndlyJSxI1nzYRFcd857DIUDKcpFpb5USrzDFDwWmBvajeGFCaYklXORC8Cdf pSBxbT+H9TR3IfpIvJcAzl7aH5xbYD1cPKpzA3D+41WUEM4ct8getMhy5GagFYhYU17w 6Fhg== 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=QeXEICZrTohYa9ryOvrvgWR6/d6mQZihUDZHNBi0W40=; b=Y+WCPRj2ejkHZ9YuSXlvoXAfy3G+bBDdacvOelSEaMMm6CePc+ekjCnEIovUDeaPHl 3U9Zs6WVvzJfpW2uhX02oUtodNuLhI9qrrTt8YsQUzboRhWS0Z6nwSNBOLiVu9Tp+JLs zIApMvoxrezOzSU6E9WkaJ4SWeLgSgYIG5p1VTmhFTeffdGKXXrGG9iDFGRoN7NOf8SO KgM1OWI2vKvTvBbu2l19MzPvD1Y/a1SFZDp7Bq0vVGciIT+SNVYFy+HraIB95EaVcaLq X1/LcPTZm7yIp04MC7PRys59KSURID1h8nkIn5RJRtS5XnHafKIdo2sh7Z3aj/HqlqbG fMFw== X-Gm-Message-State: AODbwcCfFmNUcErzNBFx38bl0gIEx0nfuTsHFwPgu8apVLNBp5wNH/0I 1XqMq4nsUpYYp8TE8u3ulI0fGVbiXg== X-Received: by 10.157.29.235 with SMTP id w40mr7569189otw.128.1496060310570; Mon, 29 May 2017 05:18:30 -0700 (PDT) Original-Received: by 10.74.139.83 with HTTP; Mon, 29 May 2017 05:18:30 -0700 (PDT) In-Reply-To: <592BC29B.6050507@gmx.at> X-Google-Sender-Auth: UJI685KjqvdCjTansYP0BlCOyk0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::22b 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:215304 Archived-At: On Mon, May 29, 2017 at 2:41 AM, martin rudalics wrote: > Please do add the name of your file there. Unfortunately, this is not > always done and so git doesn't commit here when resolving a conflict > after a pull by telling me (as of last week) something like > > admin/unidata/Makefile.in:122: new blank line at EOF. > > and I have to locally commit -n. Someone proposed a fix for this but it > apparently never made it to the repository. It's a pain because I tend > to forget about this issue until I get bitten by it the next time ... I believe the hooks were modified in [1: e20ad449de], *but* you have to rerun './autogen git' to update them in your local checkout. [1: e20ad449de]: 2017-04-29 11:42:13 -0700 Allow bypassing of some checks when merging http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=e20ad449deefa7470386bf99e05fd8c67227f678