GNU bug report logs - #16897
24.3.50; vc-print-root-log doesn't show the top commit if it's a merge commit

Previous Next

Package: emacs;

Reported by: Dmitry Gutov <dgutov <at> yandex.ru>

Date: Thu, 27 Feb 2014 17:58:01 UTC

Severity: normal

Found in version 24.3.50

Fixed in version 24.4

Done: Dmitry Gutov <dgutov <at> yandex.ru>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Dmitry Gutov <dgutov <at> yandex.ru>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#16897: closed (24.3.50; vc-print-root-log doesn't show the
 top commit if it's a merge commit)
Date: Sat, 08 Mar 2014 07:03:02 +0000
[Message part 1 (text/plain, inline)]
Your message dated Sat, 08 Mar 2014 09:02:43 +0200
with message-id <531AC093.9040001 <at> yandex.ru>
and subject line Re: bug#16897: 24.3.50; vc-print-root-log doesn't show the top commit if it's a merge commit
has caused the debbugs.gnu.org bug report #16897,
regarding 24.3.50; vc-print-root-log doesn't show the top commit if it's a merge commit
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
16897: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16897
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: Dmitry Gutov <dgutov <at> yandex.ru>
To: bug-gnu-emacs <at> 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
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 <at> gmail.com-20140219210406-y2s7lx244ojfl5on
Windowing system distributor `The X.Org Foundation', version 11.0.11405000
System Description:	Ubuntu 13.10


[Message part 3 (message/rfc822, inline)]
From: Dmitry Gutov <dgutov <at> yandex.ru>
To: Stefan Monnier <monnier <at> iro.umontreal.ca>
Cc: 16897-done <at> debbugs.gnu.org
Subject: Re: bug#16897: 24.3.50; vc-print-root-log doesn't show the top commit
 if it's a merge commit
Date: Sat, 08 Mar 2014 09:02:43 +0200
Version: 24.4

Seems to work fine.


This bug report was last modified 11 years and 75 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.