From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master d43af7b: * lisp/vc/vc.el (vc-diff-mergebase, vc-log-mergebase): New commands. Date: Tue, 2 Apr 2019 02:26:18 +0300 Message-ID: <6d47a90b-dd0c-87e5-d174-d1fd9b0e31de@yandex.ru> References: <20190325214537.7605.26562@vcs0.savannah.gnu.org> <20190325214537.ECCC520406@vcs0.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="185533"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:66.0) Gecko/20100101 Thunderbird/66.0 To: emacs-devel@gnu.org, Juri Linkov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 02 01:27:02 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hB6KT-000m8P-T8 for ged-emacs-devel@m.gmane.org; Tue, 02 Apr 2019 01:27:02 +0200 Original-Received: from localhost ([127.0.0.1]:49496 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hB6KS-0002lP-Rc for ged-emacs-devel@m.gmane.org; Mon, 01 Apr 2019 19:27:00 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:38324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hB6KG-0002jt-15 for emacs-devel@gnu.org; Mon, 01 Apr 2019 19:26:49 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hB6KE-0000dt-KI for emacs-devel@gnu.org; Mon, 01 Apr 2019 19:26:47 -0400 Original-Received: from mail-lj1-x235.google.com ([2a00:1450:4864:20::235]:46524) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hB6KD-0000Nu-Sk for emacs-devel@gnu.org; Mon, 01 Apr 2019 19:26:46 -0400 Original-Received: by mail-lj1-x235.google.com with SMTP id h21so9769535ljk.13 for ; Mon, 01 Apr 2019 16:26:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=SlYC+ikceM/BquT95T6cO9kSOBpqZfFwgzS2Wx3lrHw=; b=kP8jT0Ah6aHIkPOo0VXH29+T1eNe+BpcLJAJITY1yx2U3H3V/MlEWQlk0x3DW60Ne4 VouRzAchl3jGbryFw7ouL5PMKcIMD37QshY1ZzgvNdHqLx2yfwiGyE5bPycSTxY2cN5K o02MCXxMcMG32iz4X+Q9Y9omjXYAP+v7kgof6/2nkz3AEOyfhguIndLitBngiKWnbK5h 5+gbDcTHTOwm1lpcoZJuIp+egakd2gNC6v5uuQSosFKGbJUe6q3tQoLYCpDi18IuRQ3P SPhECWRZk4Lo5sLFvH8JRSd4gyBCqPo9nnywgo5HKAlkBPDkZ+xFJAg3z/fDa3v8/wMo dNiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=SlYC+ikceM/BquT95T6cO9kSOBpqZfFwgzS2Wx3lrHw=; b=Lv0ygnOkafo18OJAyOme5KLE3KKZBS4sy700SaR86oKRFYnOnxxO2mlaoL/I8ma8xY eBUdtMHoUc/NV4Umb7VbNWur6QE175qjwYtgt0JZqC+V8cR3cw7EfKZ+NPeqE7Dbw3fr tf61u02YH91eFfNL9qF2+eJTxPA7xGxEuNbtay9ebbvH8hrixUAgIrrNpM9vbZdZAyYL h8uTG+RXaNrxkz3yh2pJgBqZBjXkznEvbGUXIHUn5+2zlSNmeeLyAKc3wyzRvANbBaeg qN9ZYxXG5pyZcYD6Auf6gbEukt1yOpHS6gL0W+Fu3La2JwxXYPw4hQ6Gq64U5cpb6QKu 9tkQ== X-Gm-Message-State: APjAAAX9Gs44hMQsugwaZfK0hoj1rP0i8NIw3jd2rySHaEDXM6bauxda advSE9aFuEWzb+YB5/toFQUhF4c9 X-Google-Smtp-Source: APXvYqzAh3ciXT84AC20pKpjJDFMd2Vxd8oPQylONheaRJw8Ezccv9wZiRpY7Fblt1fWBdLhq05UNA== X-Received: by 2002:a2e:7e0f:: with SMTP id z15mr16100680ljc.122.1554161182221; Mon, 01 Apr 2019 16:26:22 -0700 (PDT) Original-Received: from [192.168.1.3] ([185.105.174.23]) by smtp.googlemail.com with ESMTPSA id k10sm2473146ljh.86.2019.04.01.16.26.20 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 16:26:21 -0700 (PDT) In-Reply-To: <20190325214537.ECCC520406@vcs0.savannah.gnu.org> Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::235 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:234851 Archived-At: On 25.03.2019 23:45, Juri Linkov wrote: > +(defun vc-git-mergebase (rev1 &optional rev2) > + (unless rev2 (setq rev2 "HEAD")) > + (string-trim-right (vc-git--run-command-string nil "merge-base" rev1 rev2))) vc-git--rev-parse returns the same kind of value, but trims the string differently. We should use either one of the approaches in both.