From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Nicolas Richard Newsgroups: gmane.emacs.bugs Subject: bug#22301: 25.1.50; Emacs crashes while lisp debugging Date: Wed, 20 Jan 2016 16:30:27 +0100 Message-ID: <87egdcs1yk.fsf@members.fsf.org> References: <84oad2z3lp.fsf@gmail.com> <84h9i863dv.fsf@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1453303884 3062 80.91.229.3 (20 Jan 2016 15:31:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 20 Jan 2016 15:31:24 +0000 (UTC) Cc: 22301@debbugs.gnu.org To: Vincent =?UTF-8?Q?Bela=C3=AFche?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jan 20 16:31:13 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aLuj1-00032o-8W for geb-bug-gnu-emacs@m.gmane.org; Wed, 20 Jan 2016 16:31:11 +0100 Original-Received: from localhost ([::1]:43639 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLuj0-0007pj-Ao for geb-bug-gnu-emacs@m.gmane.org; Wed, 20 Jan 2016 10:31:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLuix-0007pc-MH for bug-gnu-emacs@gnu.org; Wed, 20 Jan 2016 10:31:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLuir-0002oo-W9 for bug-gnu-emacs@gnu.org; Wed, 20 Jan 2016 10:31:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:39000) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLuir-0002ok-Sr for bug-gnu-emacs@gnu.org; Wed, 20 Jan 2016 10:31:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aLuir-0008Q1-NJ for bug-gnu-emacs@gnu.org; Wed, 20 Jan 2016 10:31:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Nicolas Richard Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 20 Jan 2016 15:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22301 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: moreinfo Original-Received: via spool by 22301-submit@debbugs.gnu.org id=B22301.145330382432311 (code B ref 22301); Wed, 20 Jan 2016 15:31:01 +0000 Original-Received: (at 22301) by debbugs.gnu.org; 20 Jan 2016 15:30:24 +0000 Original-Received: from localhost ([127.0.0.1]:55453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aLuiG-0008P4-58 for submit@debbugs.gnu.org; Wed, 20 Jan 2016 10:30:24 -0500 Original-Received: from mxin.ulb.ac.be ([164.15.128.112]:4463) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aLuiE-0008Ot-3P for 22301@debbugs.gnu.org; Wed, 20 Jan 2016 10:30:22 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AtcEANqmn1akD4Xx/2dsb2JhbABeKAECgj6EdYVynywBAQEBAQEGlSKGDwKCDwEBAQEBAYELhDUBAQMBeQULCAMhJQ8BBEmIJgjABAEBAQEBBQEBAQEchXKFPIkPBZcUjz2HPoVlimyDamSCChqBVzyHSwEBAQ Original-Received: from mathsrv4.ulb.ac.be (HELO localhost) ([164.15.133.241]) by smtp.ulb.ac.be with ESMTP; 20 Jan 2016 16:30:13 +0100 In-Reply-To: <84h9i863dv.fsf@gmail.com> ("Vincent \=\?utf-8\?Q\?Bela\=C3\=AFche\?\= \=\?utf-8\?Q\?\=22's\?\= message of "Wed, 20 Jan 2016 09:50:36 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) 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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:111804 Archived-At: > automatic commit there is an incredible number of files affected. I > don't know why that happened so... I hope I did not make anything too > hard to revert if need be. IIUC you're talking about the merge commit you created, namely b895c72059521fec064ff27b4cfcfa4104081c4e. What you did is that you were on your local branch, with your SES changes, then you git pull'd from savannah/master which created a merge commit (and then pushed the result). When creating a merge commit, emacs uses current commit as first parent, and the second parent is the commit at the tip of the other branch (in your case savannah/master). Now the trick is that "git diff" will show the diff wrt the *first* parent. In this case, git diff thus shows a diff between the merged state and the first parent, which is your own commit. IOW, it doesn't show what you changed, but everything that was changed by all other people. This is why there are many changes and you don't recognize them. If you want to check that you merged correctly, do this: "git diff b895c720^2 b895c720" or equivalently (at least with bash) : git diff b895c720{^2,} The "^2" part means "take second parent of given commit". HTH, -- Nicolas.