From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#16897: 24.3.50; vc-print-root-log doesn't show the top commit if it's a merge commit Date: Thu, 27 Feb 2014 19:57:29 +0200 Message-ID: <87eh2oqvzq.fsf@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1393523892 12909 80.91.229.3 (27 Feb 2014 17:58:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 27 Feb 2014 17:58:12 +0000 (UTC) To: 16897@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Feb 27 18:58:20 2014 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 1WJ5Dt-0003X0-3u for geb-bug-gnu-emacs@m.gmane.org; Thu, 27 Feb 2014 18:58:17 +0100 Original-Received: from localhost ([::1]:47293 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJ5Ds-0007GK-BH for geb-bug-gnu-emacs@m.gmane.org; Thu, 27 Feb 2014 12:58:16 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJ5Dk-0007GB-Ql for bug-gnu-emacs@gnu.org; Thu, 27 Feb 2014 12:58:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJ5De-0003Lr-W7 for bug-gnu-emacs@gnu.org; Thu, 27 Feb 2014 12:58:08 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:41780) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJ5De-0003Lk-SB for bug-gnu-emacs@gnu.org; Thu, 27 Feb 2014 12:58:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WJ5De-0004Q5-3g for bug-gnu-emacs@gnu.org; Thu, 27 Feb 2014 12:58:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 27 Feb 2014 17:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 16897 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.139352387916978 (code B ref -1); Thu, 27 Feb 2014 17:58:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 27 Feb 2014 17:57:59 +0000 Original-Received: from localhost ([127.0.0.1]:42962 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WJ5Da-0004Pl-Mw for submit@debbugs.gnu.org; Thu, 27 Feb 2014 12:57:59 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:58607) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WJ5DY-0004PX-SX for submit@debbugs.gnu.org; Thu, 27 Feb 2014 12:57:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJ5DS-0003KN-LA for submit@debbugs.gnu.org; Thu, 27 Feb 2014 12:57:56 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:51675) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJ5DS-0003KJ-IC for submit@debbugs.gnu.org; Thu, 27 Feb 2014 12:57:50 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60298) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJ5DM-0007Er-EE for bug-gnu-emacs@gnu.org; Thu, 27 Feb 2014 12:57:50 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJ5DG-0003Ie-Jl for bug-gnu-emacs@gnu.org; Thu, 27 Feb 2014 12:57:44 -0500 Original-Received: from mail-ee0-x231.google.com ([2a00:1450:4013:c00::231]:44920) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJ5DG-0003IQ-Co for bug-gnu-emacs@gnu.org; Thu, 27 Feb 2014 12:57:38 -0500 Original-Received: by mail-ee0-f49.google.com with SMTP id b57so1590532eek.22 for ; Thu, 27 Feb 2014 09:57:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:mime-version:content-type; bh=QmKhGax2d01wbc11Rg9GTkQwpVsXgX0PT5wNlpsnhtY=; b=KYkPeIS35weh9ctrSUy7VoxH0ecgt4uI6jTXRVvf9/n8ZWkNcBM8Kz82p5kVD4q+Nv Iuk6fk4N0EZBjwMSqhLxBThPZnMk397KwONPojRm/JMhJMfhi2wgc6M3Uz/1tdo/zbZU w2DfRMP5zvlG9Wu2aYdFn+xaHmZMv1J/+13Elu84T5cKeFDQ7TGUQFpBTolCymJ1N769 MGOTuVl3SQpUaSmkPnEo+NfwLn6PHTzMexJfo29slzsMY77cjxIYDLkITQeDI/dl8fWE TXNpITianwTNNZmMAjCPVlqEm/oC6HO3hfTLhFtcOIRrDVSgqq7tC745khg86jJD3qgp uC/Q== X-Received: by 10.14.176.66 with SMTP id a42mr10991027eem.101.1393523857130; Thu, 27 Feb 2014 09:57:37 -0800 (PST) Original-Received: from axl (static-nbl2-118.cytanet.com.cy. [212.31.107.118]) by mx.google.com with ESMTPSA id 43sm219122eeh.13.2014.02.27.09.57.34 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 27 Feb 2014 09:57:36 -0800 (PST) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.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:86311 Archived-At: 1. Open a Git repo. 2. Do a simple, non-fast-forward merge from some branch into the current (but it has to succeed without conflicts). 3. Press `C-x v L`. The top commit will be hidden, apparently because 'git log' is passed the 'path' argument, namely the root directory of the repository, and so it somehow ignores the commit that doesn't add anything to the histroy beyond the contents of its parents. Using Git 1.8.3.2. If I replace `files' with 'nil' in `vc-git-print-log', the top commit is displayed. Not sure how to handle this best. Perhaps just compare `files' with (list default-directory)? That's assuming at least some other backend needs a non-nil valus of `files' to retrieve the root log. In GNU Emacs 24.3.50.3 (x86_64-unknown-linux-gnu, GTK+ Version 3.8.6) of 2014-02-20 on axl Repository revision: 116484 lekktu@gmail.com-20140219210406-y2s7lx244ojfl5on Windowing system distributor `The X.Org Foundation', version 11.0.11405000 System Description: Ubuntu 13.10