From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#20717: attribution of gitmerge.el merged entries in generated ChangeLog Date: Sat, 06 Jun 2015 09:55:45 +0300 Message-ID: <83h9qlnx5a.fsf@gnu.org> References: Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1433573785 2298 80.91.229.3 (6 Jun 2015 06:56:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 6 Jun 2015 06:56:25 +0000 (UTC) Cc: 20717@debbugs.gnu.org To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jun 06 08:56:14 2015 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 1Z181b-0006JE-G8 for geb-bug-gnu-emacs@m.gmane.org; Sat, 06 Jun 2015 08:56:11 +0200 Original-Received: from localhost ([::1]:50640 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z181a-00076w-LG for geb-bug-gnu-emacs@m.gmane.org; Sat, 06 Jun 2015 02:56:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z181W-00076r-Ft for bug-gnu-emacs@gnu.org; Sat, 06 Jun 2015 02:56:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z181T-0004c7-8i for bug-gnu-emacs@gnu.org; Sat, 06 Jun 2015 02:56:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:60647) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z181T-0004c1-4F for bug-gnu-emacs@gnu.org; Sat, 06 Jun 2015 02:56:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Z181S-0003ur-Kt for bug-gnu-emacs@gnu.org; Sat, 06 Jun 2015 02:56:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 06 Jun 2015 06:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20717 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 20717-submit@debbugs.gnu.org id=B20717.143357375815043 (code B ref 20717); Sat, 06 Jun 2015 06:56:02 +0000 Original-Received: (at 20717) by debbugs.gnu.org; 6 Jun 2015 06:55:58 +0000 Original-Received: from localhost ([127.0.0.1]:42389 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z181N-0003uY-1t for submit@debbugs.gnu.org; Sat, 06 Jun 2015 02:55:57 -0400 Original-Received: from mtaout29.012.net.il ([80.179.55.185]:58695) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z181K-0003uK-QB for 20717@debbugs.gnu.org; Sat, 06 Jun 2015 02:55:55 -0400 Original-Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il (HyperSendmail v2007.08) id <0NPI00600FLE7O00@mtaout29.012.net.il> for 20717@debbugs.gnu.org; Sat, 06 Jun 2015 09:55:09 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout29.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NPI006H5GJXIC30@mtaout29.012.net.il>; Sat, 06 Jun 2015 09:55:09 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il 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:103643 Archived-At: > From: Glenn Morris > Date: Fri, 05 Jun 2015 18:06:49 -0400 > > Glenn Morris wrote: > > > After using M-x gitmerge (which seems v nice, BTW), 'make ChangeLog' > > creates a file with contents: > > > > 2015-06-01 Glenn Morris > > > > Merge from origin/emacs-24 > > 8b5f2f4 * doc/emacs/emacs.texi: Update the ISBN of the Emacs manual. > > > > The merged entries should be listed under the name of the original > > author(s), not the name of the person who did the merge. > > Oh, I see we actually get both. The above entry on the date of the > merge, and another entry (with the correct attribution) on the date the > change was originally made (which of course has zero relation to the > merge date) in the original branch. And changes that were skipped from > the merge are still included. What a confusing mess. I'm guessing that you are using "git log" to show this. That command could produce confusing results if you don't pay attention to branches and ancestry of each commit, because it shows a non-linear history in a linear fashion. That's unlike what "bzr log" did, where it would show only mainline commits by default, and if invoked with -n0, would show the commits on branches indented. I suggest to use "git log --graph" instead, where you should see that one of these commits was on a branch, and the one that's attributed to you is the merge-commit. For commits on "mainline", you can use "git log --first-parent" to show only mainline commits, but this will not help you in the case in point.