From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Commit mistake? Date: Sun, 25 Nov 2018 18:34:50 +0200 Message-ID: <83bm6djetx.fsf@gnu.org> References: <87pnutqol6.fsf@gmx.net> NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1543163606 8982 195.159.176.226 (25 Nov 2018 16:33:26 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 25 Nov 2018 16:33:26 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stephen Berman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 25 17:33:21 2018 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 1gQxLU-0002BS-Ls for ged-emacs-devel@m.gmane.org; Sun, 25 Nov 2018 17:33:20 +0100 Original-Received: from localhost ([::1]:60388 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gQxNb-0005Bc-81 for ged-emacs-devel@m.gmane.org; Sun, 25 Nov 2018 11:35:31 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gQxMx-0005BM-Vz for emacs-devel@gnu.org; Sun, 25 Nov 2018 11:34:52 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gQxMu-00065J-1f for emacs-devel@gnu.org; Sun, 25 Nov 2018 11:34:51 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54691) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gQxMt-00065F-V0; Sun, 25 Nov 2018 11:34:47 -0500 Original-Received: from [176.228.60.248] (port=4783 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1gQxMt-00031Q-Ir; Sun, 25 Nov 2018 11:34:47 -0500 In-reply-to: <87pnutqol6.fsf@gmx.net> (message from Stephen Berman on Sun, 25 Nov 2018 14:22:13 +0100) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:231342 Archived-At: > From: Stephen Berman > Date: Sun, 25 Nov 2018 14:22:13 +0100 > > I just committed a fix for bug#33423 to master (29ef7d1), and somehow > the commit included an entire unrelated file, nt/gnulib.mk. I don't > know how this happened, because that is a file I'm not aware of ever > having touched, let alone changed (it's a generated file). I don't know > if this is a problem but if it is, can someone who knows what to do > please take care of it, or tell me how to? Just delete that file, it should not be in the repository. "git rm" etc. (Let me know if you need more detailed instructions.) > And also tell me how to avoid a possible reoccurrence of in future > commits? Thanks and sorry for the nuisance. The only reliable way I know of is to say "git show" after committing and before pushing, and review the diffs carefully making sure the commit only includes what I meant it to.