From unknown Wed Jun 18 23:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#16897: 24.3.50; vc-print-root-log doesn't show the top commit if it's a merge commit 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: To: 16897@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.139352387916978 (code B ref -1); Thu, 27 Feb 2014 17:58:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Feb 2014 17:57:59 +0000 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 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 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 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 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 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 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 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) 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) From: Dmitry Gutov Date: Thu, 27 Feb 2014 19:57:29 +0200 Message-ID: <87eh2oqvzq.fsf@yandex.ru> MIME-Version: 1.0 Content-Type: text/plain 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) 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 From unknown Wed Jun 18 23:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#16897: 24.3.50; vc-print-root-log doesn't show the top commit if it's a merge commit Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 28 Feb 2014 13:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16897 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dmitry Gutov Cc: 16897@debbugs.gnu.org Received: via spool by 16897-submit@debbugs.gnu.org id=B16897.139359532832052 (code B ref 16897); Fri, 28 Feb 2014 13:49:01 +0000 Received: (at 16897) by debbugs.gnu.org; 28 Feb 2014 13:48:48 +0000 Received: from localhost ([127.0.0.1]:43781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WJNnz-0008Kt-Sn for submit@debbugs.gnu.org; Fri, 28 Feb 2014 08:48:48 -0500 Received: from ironport2-out.teksavvy.com ([206.248.154.181]:46259) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WJNnu-0008Ki-HM for 16897@debbugs.gnu.org; Fri, 28 Feb 2014 08:48:43 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av8EABK/CFHO+KLz/2dsb2JhbABEuzWDWRdzgh4BAQQBViMFCwsOJhIUGA0kiB4GwS2RCgOIYZwZgV6DFQ X-IPAS-Result: Av8EABK/CFHO+KLz/2dsb2JhbABEuzWDWRdzgh4BAQQBViMFCwsOJhIUGA0kiB4GwS2RCgOIYZwZgV6DFQ X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="48974055" Received: from 206-248-162-243.dsl.teksavvy.com (HELO pastel.home) ([206.248.162.243]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 28 Feb 2014 08:48:41 -0500 Received: by pastel.home (Postfix, from userid 20848) id 27E626057F; Fri, 28 Feb 2014 08:48:40 -0500 (EST) From: Stefan Monnier Message-ID: References: <87eh2oqvzq.fsf@yandex.ru> Date: Fri, 28 Feb 2014 08:48:40 -0500 In-Reply-To: <87eh2oqvzq.fsf@yandex.ru> (Dmitry Gutov's message of "Thu, 27 Feb 2014 19:57:29 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) > Perhaps just compare `files' with (list default-directory)? Yes, something like that is needed for other circumstances as well, Stefan From unknown Wed Jun 18 23:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#16897: 24.3.50; vc-print-root-log doesn't show the top commit if it's a merge commit Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 28 Feb 2014 14:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16897 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Stefan Monnier Cc: 16897@debbugs.gnu.org Received: via spool by 16897-submit@debbugs.gnu.org id=B16897.13935974083519 (code B ref 16897); Fri, 28 Feb 2014 14:24:02 +0000 Received: (at 16897) by debbugs.gnu.org; 28 Feb 2014 14:23:28 +0000 Received: from localhost ([127.0.0.1]:43798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WJOLX-0000uh-OU for submit@debbugs.gnu.org; Fri, 28 Feb 2014 09:23:27 -0500 Received: from mail-ea0-f171.google.com ([209.85.215.171]:64445) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WJOLU-0000uT-Qj for 16897@debbugs.gnu.org; Fri, 28 Feb 2014 09:23:25 -0500 Received: by mail-ea0-f171.google.com with SMTP id n15so1242409ead.30 for <16897@debbugs.gnu.org>; Fri, 28 Feb 2014 06:23:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=Cwe5DJwsN/P9xeI3eNkEkdHHr7zS30ONdlm6FyCXT70=; b=xPea2iKl6RFszeNPzxObp7WR45oJ+C+U4rHf2P+cxpzZ6g8O1eir2/S5CpwBHbvhRc DF/YbN/qskOVbafrbufF3WifQoGyYI37/6VKPTvaJBzE3bTMb8xi/tCnGesVtzvHaIEH iYaUNCp+jpIRKg5Mzw/DxgucIsbQ/IyUXyG6aPzEsn6xjXYV24pgCOuWmSAlDmVKH448 YE2Vx3HR4TGl3zTRpJuRJjkAOrbtP3si6ErDbz7z90/+6JBdORsAiRhKCKOOQoJEqBh4 1NY4qQjxVqge5Ey6nXbxr/C8P3Agyr5T5lLpe42/rUKgygeLzl3ncBfOskxjbbRrDlw+ UyWg== X-Received: by 10.14.221.4 with SMTP id q4mr21297314eep.47.1393597403700; Fri, 28 Feb 2014 06:23:23 -0800 (PST) Received: from [192.168.0.94] (static-nbl2-118.cytanet.com.cy. [212.31.107.118]) by mx.google.com with ESMTPSA id l4sm10990758eeo.9.2014.02.28.06.23.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Feb 2014 06:23:22 -0800 (PST) Message-ID: <53109BD8.70401@yandex.ru> Date: Fri, 28 Feb 2014 16:23:20 +0200 From: Dmitry Gutov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 References: <87eh2oqvzq.fsf@yandex.ru> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On 28.02.2014 15:48, Stefan Monnier wrote: > Yes, something like that is needed for other circumstances as well, Do you mean other uses of `vc-git-print-log'? From unknown Wed Jun 18 23:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#16897: 24.3.50; vc-print-root-log doesn't show the top commit if it's a merge commit Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 28 Feb 2014 17:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16897 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dmitry Gutov Cc: 16897@debbugs.gnu.org Received: via spool by 16897-submit@debbugs.gnu.org id=B16897.139360831428582 (code B ref 16897); Fri, 28 Feb 2014 17:26:03 +0000 Received: (at 16897) by debbugs.gnu.org; 28 Feb 2014 17:25:14 +0000 Received: from localhost ([127.0.0.1]:44853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WJRBR-0007Qr-3q for submit@debbugs.gnu.org; Fri, 28 Feb 2014 12:25:13 -0500 Received: from ironport2-out.teksavvy.com ([206.248.154.181]:54936) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WJRBM-0007Qc-SX for 16897@debbugs.gnu.org; Fri, 28 Feb 2014 12:25:09 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av8EABK/CFHO+KLz/2dsb2JhbABEuzWDWRdzgh4BAQQBViMQCw4mEhQYDSSIHgbBLZEKA4hhnBmBXoMV X-IPAS-Result: Av8EABK/CFHO+KLz/2dsb2JhbABEuzWDWRdzgh4BAQQBViMQCw4mEhQYDSSIHgbBLZEKA4hhnBmBXoMV X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="49000168" Received: from 206-248-162-243.dsl.teksavvy.com (HELO pastel.home) ([206.248.162.243]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 28 Feb 2014 12:25:07 -0500 Received: by pastel.home (Postfix, from userid 20848) id 05D7D60452; Fri, 28 Feb 2014 12:24:59 -0500 (EST) From: Stefan Monnier Message-ID: References: <87eh2oqvzq.fsf@yandex.ru> <53109BD8.70401@yandex.ru> Date: Fri, 28 Feb 2014 12:24:59 -0500 In-Reply-To: <53109BD8.70401@yandex.ru> (Dmitry Gutov's message of "Fri, 28 Feb 2014 16:23:20 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) >> Yes, something like that is needed for other circumstances as well, > Do you mean other uses of `vc-git-print-log'? No: other circumstances where we pass a list of files to Git. IOW, maybe vc-git-command should support turning a (list default-directory) into nil. Stefan From unknown Wed Jun 18 23:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#16897: 24.3.50; vc-print-root-log doesn't show the top commit if it's a merge commit Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 01 Mar 2014 06:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16897 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Stefan Monnier Cc: 16897@debbugs.gnu.org Received: via spool by 16897-submit@debbugs.gnu.org id=B16897.139365465116035 (code B ref 16897); Sat, 01 Mar 2014 06:18:02 +0000 Received: (at 16897) by debbugs.gnu.org; 1 Mar 2014 06:17:31 +0000 Received: from localhost ([127.0.0.1]:45182 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WJdEo-0004AY-R0 for submit@debbugs.gnu.org; Sat, 01 Mar 2014 01:17:31 -0500 Received: from mail-ee0-f48.google.com ([74.125.83.48]:46995) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WJdEk-0004AK-CO for 16897@debbugs.gnu.org; Sat, 01 Mar 2014 01:17:27 -0500 Received: by mail-ee0-f48.google.com with SMTP id e51so1638733eek.35 for <16897@debbugs.gnu.org>; Fri, 28 Feb 2014 22:17:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=+4lSFVQmhLM1wuhVLwH0TkhS1dI6He2F9jK4/yntjIU=; b=EZ43uk1RELy6ZNp7mvfYgsaifyOa/IzyOHd7dayXJVXpfV9YJZritwcG7co7ozxxzN AxsFMIn2j7mymhvrE9Rh0JvmbuPq88dim71wxyd5CSUmJpGy5AR9gcz9cWVhOqJ/QCjn CA85Fxr7PvqVTx9FqwF0miUeip4NWZB/Wk3e/Se5GN/LlcDWyuQjxwpqDcDegGvyjsk8 Xpr0nHHH8QVHewvPi+BcOO9bmRIlRSmZB3sY647cQLfhrI7QAcqOVy71gSQf2VmgIPTz 3OgR6iJ3sViujj/68JYkEvM3n/gjjJ+PpD1NCDueEhfHyiQ3wAPYb13AbCGC40ReGMYs AeQA== X-Received: by 10.14.8.194 with SMTP id 42mr25976682eer.16.1393654645359; Fri, 28 Feb 2014 22:17:25 -0800 (PST) Received: from [192.168.10.2] ([93.109.195.252]) by mx.google.com with ESMTPSA id l4sm19453965eeo.9.2014.02.28.22.17.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Feb 2014 22:17:24 -0800 (PST) Message-ID: <53117B71.3040200@yandex.ru> Date: Sat, 01 Mar 2014 08:17:21 +0200 From: Dmitry Gutov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 References: <87eh2oqvzq.fsf@yandex.ru> <53109BD8.70401@yandex.ru> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On 28.02.2014 19:24, Stefan Monnier wrote: >>> Yes, something like that is needed for other circumstances as well, >> Do you mean other uses of `vc-git-print-log'? > > No: other circumstances where we pass a list of files to Git. > IOW, maybe vc-git-command should support turning a (list > default-directory) into nil. This sort of assumes that default-directory is always the root dir. Which isn't true. Of course it seems that in practice, whenever file-or-list is the same as (list default-directory), the latter *is* the root dir. But that's a shaky assumption. I'm not sure I want to spend another process call to determine what the actual root dir is each time, so maybe we should limit the fix to `vc-git-print-log'. At least, until any other command is known to exhibit a similar bug. From unknown Wed Jun 18 23:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#16897: 24.3.50; vc-print-root-log doesn't show the top commit if it's a merge commit Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 01 Mar 2014 17:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16897 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dmitry Gutov Cc: 16897@debbugs.gnu.org Received: via spool by 16897-submit@debbugs.gnu.org id=B16897.139369401128955 (code B ref 16897); Sat, 01 Mar 2014 17:14:01 +0000 Received: (at 16897) by debbugs.gnu.org; 1 Mar 2014 17:13:31 +0000 Received: from localhost ([127.0.0.1]:46904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WJnTe-0007Wx-JB for submit@debbugs.gnu.org; Sat, 01 Mar 2014 12:13:30 -0500 Received: from ironport2-out.teksavvy.com ([206.248.154.181]:17396) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WJnTc-0007Wo-7M for 16897@debbugs.gnu.org; Sat, 01 Mar 2014 12:13:29 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av8EABK/CFHO+KLz/2dsb2JhbABEuzWDWRdzgh4BAQQBViMFCwsOJhIUGA0kiB4GwS2RCgOIYZwZgV6DFQ X-IPAS-Result: Av8EABK/CFHO+KLz/2dsb2JhbABEuzWDWRdzgh4BAQQBViMFCwsOJhIUGA0kiB4GwS2RCgOIYZwZgV6DFQ X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="49100953" Received: from 206-248-162-243.dsl.teksavvy.com (HELO pastel.home) ([206.248.162.243]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 01 Mar 2014 12:13:27 -0500 Received: by pastel.home (Postfix, from userid 20848) id 3A5AA60255; Sat, 1 Mar 2014 12:13:27 -0500 (EST) From: Stefan Monnier Message-ID: References: <87eh2oqvzq.fsf@yandex.ru> <53109BD8.70401@yandex.ru> <53117B71.3040200@yandex.ru> Date: Sat, 01 Mar 2014 12:13:27 -0500 In-Reply-To: <53117B71.3040200@yandex.ru> (Dmitry Gutov's message of "Sat, 01 Mar 2014 08:17:21 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) > This sort of assumes that default-directory is always the root dir. Obviously, we'd want to compare to root-dir, not to default-dir. And we'd want to cache the result so as to avoid looking for the root directory repeatedly. Stefan From unknown Wed Jun 18 23:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#16897: 24.3.50; vc-print-root-log doesn't show the top commit if it's a merge commit Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 02 Mar 2014 02:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16897 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Stefan Monnier Cc: 16897@debbugs.gnu.org Received: via spool by 16897-submit@debbugs.gnu.org id=B16897.139372829727938 (code B ref 16897); Sun, 02 Mar 2014 02:45:02 +0000 Received: (at 16897) by debbugs.gnu.org; 2 Mar 2014 02:44:57 +0000 Received: from localhost ([127.0.0.1]:47221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WJwOe-0007GX-8b for submit@debbugs.gnu.org; Sat, 01 Mar 2014 21:44:56 -0500 Received: from mail-ee0-f47.google.com ([74.125.83.47]:60556) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WJwOc-0007GP-4g for 16897@debbugs.gnu.org; Sat, 01 Mar 2014 21:44:54 -0500 Received: by mail-ee0-f47.google.com with SMTP id b15so404105eek.20 for <16897@debbugs.gnu.org>; Sat, 01 Mar 2014 18:44:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=I99wsNT/kIH2U/k1EABvNA/k8/AkyR/IXPvR3nr7wg8=; b=JENRADcj9ceHc+muPR7KSsLTq6L24/VA+343V2jFdx4Ez28JswUIJkqZJGMvDz719D CIYCdhwH+vKeio0OtySIP8ujF5PYQMBt95Zksr3+IyWbhdXfEKp9mZ14IJtAYTHP6wsJ NeqRCoGJI0iuaZ/w0ceJRfZvg9gHyTTqxNF9owiiZdlVIcDuwQKbkB2okDJtCsoP15CC mJitJ8whl3ojigE22+h+ui3NqG+9hwn2MiNMMXn6bvyXjrntSUDdibW8J9kMmhvbwIBo 3mJ3irDepMVFXsdBQ8QoqJB8xJ5o4r05F6eJ7lFOKGIlnzedJhHVWjh7l0UTHUZO3e8o BrCg== X-Received: by 10.14.216.3 with SMTP id f3mr31026203eep.66.1393728293022; Sat, 01 Mar 2014 18:44:53 -0800 (PST) Received: from [192.168.10.2] ([93.109.195.252]) by mx.google.com with ESMTPSA id o43sm30893208eef.12.2014.03.01.18.44.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 01 Mar 2014 18:44:52 -0800 (PST) Message-ID: <53129B20.4020601@yandex.ru> Date: Sun, 02 Mar 2014 04:44:48 +0200 From: Dmitry Gutov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 References: <87eh2oqvzq.fsf@yandex.ru> <53109BD8.70401@yandex.ru> <53117B71.3040200@yandex.ru> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On 01.03.2014 19:13, Stefan Monnier wrote: > Obviously, we'd want to compare to root-dir, not to default-dir. > And we'd want to cache the result so as to avoid looking for the root > directory repeatedly. `vc-git-root' already does caching, but it uses `vc-file-prop-obarray'. We would be calling it on directories, so these cache entries would never be invalidated. Do you foresee any problems with that? From unknown Wed Jun 18 23:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#16897: 24.3.50; vc-print-root-log doesn't show the top commit if it's a merge commit Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 07 Mar 2014 20:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16897 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dmitry Gutov Cc: 16897@debbugs.gnu.org Received: via spool by 16897-submit@debbugs.gnu.org id=B16897.139422567010701 (code B ref 16897); Fri, 07 Mar 2014 20:55:02 +0000 Received: (at 16897) by debbugs.gnu.org; 7 Mar 2014 20:54:30 +0000 Received: from localhost ([127.0.0.1]:55206 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WM1mn-0002mW-8Y for submit@debbugs.gnu.org; Fri, 07 Mar 2014 15:54:29 -0500 Received: from ironport2-out.teksavvy.com ([206.248.154.181]:50733) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WM1mk-0002mO-GK for 16897@debbugs.gnu.org; Fri, 07 Mar 2014 15:54:26 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: At8KABK/CFFMCppy/2dsb2JhbABEuzWCWAQCexdzgh4BAQQBViMFCwsOJhIUGA0kiB4GwS2RCgOIYZwZgV6DFQ X-IPAS-Result: At8KABK/CFFMCppy/2dsb2JhbABEuzWCWAQCexdzgh4BAQQBViMFCwsOJhIUGA0kiB4GwS2RCgOIYZwZgV6DFQ X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="50828293" Received: from 76-10-154-114.dsl.teksavvy.com (HELO pastel.home) ([76.10.154.114]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 07 Mar 2014 15:54:25 -0500 Received: by pastel.home (Postfix, from userid 20848) id B35AC60349; Fri, 7 Mar 2014 15:54:25 -0500 (EST) From: Stefan Monnier Message-ID: References: <87eh2oqvzq.fsf@yandex.ru> <53109BD8.70401@yandex.ru> <53117B71.3040200@yandex.ru> <53129B20.4020601@yandex.ru> Date: Fri, 07 Mar 2014 15:54:25 -0500 In-Reply-To: <53129B20.4020601@yandex.ru> (Dmitry Gutov's message of "Sun, 02 Mar 2014 04:44:48 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) > We would be calling it on directories, so these cache entries would never be > invalidated. Do you foresee any problems with that? I think it's OK. Stefan From unknown Wed Jun 18 23:16:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#16897: 24.3.50; vc-print-root-log doesn't show the top commit if it's a merge commit Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 08 Mar 2014 00:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16897 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Stefan Monnier Cc: 16897@debbugs.gnu.org Received: via spool by 16897-submit@debbugs.gnu.org id=B16897.13942396928546 (code B ref 16897); Sat, 08 Mar 2014 00:49:02 +0000 Received: (at 16897) by debbugs.gnu.org; 8 Mar 2014 00:48:12 +0000 Received: from localhost ([127.0.0.1]:55359 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WM5Qx-0002Dk-JX for submit@debbugs.gnu.org; Fri, 07 Mar 2014 19:48:11 -0500 Received: from mail-ee0-f46.google.com ([74.125.83.46]:32806) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WM5Qu-0002DV-OG for 16897@debbugs.gnu.org; Fri, 07 Mar 2014 19:48:09 -0500 Received: by mail-ee0-f46.google.com with SMTP id t10so1986898eei.5 for <16897@debbugs.gnu.org>; Fri, 07 Mar 2014 16:48:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=oku7QaHHYCNAJ1cJJ+OWdwjfcCqavzMj++rAc0/vzNI=; b=ep/SvUaBTFvzv8JrZAioBexl31dWfxdG/IFmaik8qtdhxwZvwHyR71XCjd/yjIs3Kv Mo+7qhrDHMAffllnJD0xTTIMqtggWbEEEb39T/j1MXW/y9WNQHzdlo/iLgcx4iT3Tg1r uFeI9fmO1JkxUfeNGPWECR5r/UkgVpbMjJY3qxQyb58xTOdg4fDDbMPyrZ/JtIAXTimz 770+IobrH/SEFFLSrG5kwCINDExy6tA8szfmNxjdr7nquEJEg4IfvzMEXB2219D7p57n rAOWjpwLhnzV0wcSr9N90HBJ72DHlzgIzqYdhdSvkB3GJY02yHRnSmxbT4oKPWk1oxST vvFA== X-Received: by 10.14.10.73 with SMTP id 49mr22271159eeu.52.1394239687890; Fri, 07 Mar 2014 16:48:07 -0800 (PST) Received: from [192.168.10.2] ([93.109.111.194]) by mx.google.com with ESMTPSA id cb5sm12942533eeb.18.2014.03.07.16.48.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Mar 2014 16:48:07 -0800 (PST) Message-ID: <531A68C3.2010506@yandex.ru> Date: Sat, 08 Mar 2014 02:48:03 +0200 From: Dmitry Gutov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 References: <87eh2oqvzq.fsf@yandex.ru> <53109BD8.70401@yandex.ru> <53117B71.3040200@yandex.ru> <53129B20.4020601@yandex.ru> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On 07.03.2014 22:54, Stefan Monnier wrote: > I think it's OK. OK, I'll go ahead and make the change for 24.4. From unknown Wed Jun 18 23:16:41 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.503 (Entity 5.503) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Dmitry Gutov Subject: bug#16897: closed (Re: bug#16897: 24.3.50; vc-print-root-log doesn't show the top commit if it's a merge commit) Message-ID: References: <531AC093.9040001@yandex.ru> <87eh2oqvzq.fsf@yandex.ru> X-Gnu-PR-Message: they-closed 16897 X-Gnu-PR-Package: emacs Reply-To: 16897@debbugs.gnu.org Date: Sat, 08 Mar 2014 07:03:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1394262183-22773-1" This is a multi-part message in MIME format... ------------=_1394262183-22773-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #16897: 24.3.50; vc-print-root-log doesn't show the top commit if it's a me= rge commit which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 16897@debbugs.gnu.org. --=20 16897: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D16897 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1394262183-22773-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 16897-done) by debbugs.gnu.org; 8 Mar 2014 07:02:51 +0000 Received: from localhost ([127.0.0.1]:55556 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WMBHW-0005up-Dz for submit@debbugs.gnu.org; Sat, 08 Mar 2014 02:02:50 -0500 Received: from mail-ea0-f173.google.com ([209.85.215.173]:62538) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WMBHT-0005ug-H1 for 16897-done@debbugs.gnu.org; Sat, 08 Mar 2014 02:02:48 -0500 Received: by mail-ea0-f173.google.com with SMTP id r15so2668813ead.18 for <16897-done@debbugs.gnu.org>; Fri, 07 Mar 2014 23:02:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=t+KzQdT8lzS8Nyt6j6TEQ6cw34M5x36ofs4v/3Kf3ag=; b=OyoPBHF01FwHBc+3wPL1j7HjhqA90lQUnB6c1RyYznkv4PCmiutL5iJz+k05L0+BBB Eosly+CFCL+Z7GwlOQ/Kom0UPwcDq6Ps4RPVsl2AXq4rC0iIN9hnHyv9M56LTuYgrozZ 0tf4595/49xGdsjrUjVATrpnwm0UrakV+1nKiGAtWIlYAYmSmQvGuYxv7N1XcQFG09gM ehtjGAzYxabzA2cfgWhW/fob/dEgt3gdy7cmLe1hC5+aFzkxIrFTEfSxSHvl7A+ZSR0O H9tml5BjU0Bb+xCe5WTtE47R+MHSL0Kcao/+iZ0IIPocRH20vDFjTh39NU5rgr/NqVUb kL5A== X-Received: by 10.15.76.135 with SMTP id n7mr23037597eey.36.1394262166643; Fri, 07 Mar 2014 23:02:46 -0800 (PST) Received: from [192.168.10.2] (87-239-24.netrun.cytanet.com.cy. [87.228.239.24]) by mx.google.com with ESMTPSA id x6sm15909299eew.20.2014.03.07.23.02.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Mar 2014 23:02:45 -0800 (PST) Message-ID: <531AC093.9040001@yandex.ru> Date: Sat, 08 Mar 2014 09:02:43 +0200 From: Dmitry Gutov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Stefan Monnier Subject: Re: bug#16897: 24.3.50; vc-print-root-log doesn't show the top commit if it's a merge commit References: <87eh2oqvzq.fsf@yandex.ru> <53109BD8.70401@yandex.ru> <53117B71.3040200@yandex.ru> <53129B20.4020601@yandex.ru> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 16897-done Cc: 16897-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Version: 24.4 Seems to work fine. ------------=_1394262183-22773-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 27 Feb 2014 17:57:59 +0000 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 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 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 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 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 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 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 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) 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) From: Dmitry Gutov To: bug-gnu-emacs@gnu.org Subject: 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> MIME-Version: 1.0 Content-Type: text/plain 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) 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 ------------=_1394262183-22773-1--