From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: git apologia Date: Sun, 16 Nov 2014 18:06:17 +0200 Message-ID: <83389jdtae.fsf@gnu.org> References: <20141114183737.GB3168@acm.acm> <5466517B.50705@porkrind.org> <20141114215404.GD3168@acm.acm> <838ujchods.fsf@gnu.org> <8761egx1k2.fsf@uwakimon.sk.tsukuba.ac.jp> <83sihkg2ds.fsf@gnu.org> <87vbmgv3b9.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416154040 30796 80.91.229.3 (16 Nov 2014 16:07:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 16:07:20 +0000 (UTC) Cc: emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 17:07:13 2014 Return-path: Envelope-to: ged-emacs-devel@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 1Xq2M5-0006Si-EX for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 17:07:13 +0100 Original-Received: from localhost ([::1]:44237 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq2M5-0006mh-0J for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 11:07:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq2Lm-0006mN-Fb for emacs-devel@gnu.org; Sun, 16 Nov 2014 11:06:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xq2Lh-00088Y-9A for emacs-devel@gnu.org; Sun, 16 Nov 2014 11:06:54 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:64979) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xq2Lh-00088T-1e for emacs-devel@gnu.org; Sun, 16 Nov 2014 11:06:49 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NF500M0035OHI00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sun, 16 Nov 2014 18:06:29 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF500MK33ETHD10@a-mtaout22.012.net.il>; Sun, 16 Nov 2014 18:06:29 +0200 (IST) In-reply-to: <87vbmgv3b9.fsf@uwakimon.sk.tsukuba.ac.jp> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177315 Archived-At: > From: "Stephen J. Turnbull" > Date: Sun, 16 Nov 2014 01:25:30 +0900 > Cc: emacs-devel@gnu.org > > Eli Zaretskii writes: > > > The result is that I'm not even sure I figured out the "@~n..@~m" > > spec correctly (did I?). > > You did. Actually, it turns out neither this nor HEAD~n is what I want. What I want is to display information about commits N..M where N and M are ordinal numbers from the linear "git log" output. And waddaya know? HEAD~n etc. seem to _skip_ merge-commits, so (a) the counts end up being wrong, and (b) if you want to see those merge-commits, you need to _know_ they are merge-commits and then use HEAD^2 etc. (i.e. explicitly request the 2nd parent). This is awful. The result is that to simulate bzr's "diff -r-N..-M" functionality I had to write a special-purpose alias, using "log --skip=N -nM -p -c", in order to be able to display the diffs of a range of commits that include merge-commits. Ugh! (Or maybe I missed some magic that allows to do this with less pain.)