From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#15696: 24.3; vc-git-annotate-command -- ambiguous short commit hashes cause failures Date: Sun, 06 Dec 2020 16:17:52 +0100 Message-ID: <87mtyr9d5r.fsf@gnus.org> References: <60659.202.78.240.7.1382567791.squirrel@mail.orcon.net.nz> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8177"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: 15696@debbugs.gnu.org To: "Phil Sainty" Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Dec 06 16:19:18 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1klvok-00021B-Nk for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 06 Dec 2020 16:19:18 +0100 Original-Received: from localhost ([::1]:49432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1klvoj-0007p9-Iw for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 06 Dec 2020 10:19:17 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:38364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klvoU-0007og-6N for bug-gnu-emacs@gnu.org; Sun, 06 Dec 2020 10:19:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:39211) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1klvoT-0005Ji-TO for bug-gnu-emacs@gnu.org; Sun, 06 Dec 2020 10:19:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1klvoT-0004Nn-PQ for bug-gnu-emacs@gnu.org; Sun, 06 Dec 2020 10:19:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 06 Dec 2020 15:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 15696 X-GNU-PR-Package: emacs Original-Received: via spool by 15696-submit@debbugs.gnu.org id=B15696.160726788416762 (code B ref 15696); Sun, 06 Dec 2020 15:19:01 +0000 Original-Received: (at 15696) by debbugs.gnu.org; 6 Dec 2020 15:18:04 +0000 Original-Received: from localhost ([127.0.0.1]:50754 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klvnX-0004MI-TJ for submit@debbugs.gnu.org; Sun, 06 Dec 2020 10:18:04 -0500 Original-Received: from quimby.gnus.org ([95.216.78.240]:54108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klvnW-0004Li-NZ for 15696@debbugs.gnu.org; Sun, 06 Dec 2020 10:18:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ggGHDeZbZ3NVQTLhg1zc3ViazW8hSNGP4PmNQyIpJ3U=; b=NPxya8EN63hjBfFOVXP4VfVM0l x1KFLizubmk9YROfP2sqxschwRS4aBYdL0NVmQd3gJjV9hxLVORpUpYMVSFJorXe5bWuXbDbA06ou qmlUw9oUZKXpkNSci2DCwgpHUrEYsElv4MgvtOBi4DpCAPT7aZgzPhyOWF0j2AIe+k70=; Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1klvnN-0005RV-9W; Sun, 06 Dec 2020 16:17:56 +0100 X-Now-Playing: Jacek Sienkiewicz's _Pres Rebooted_: "120 D-Rooms" In-Reply-To: <60659.202.78.240.7.1382567791.squirrel@mail.orcon.net.nz> (Phil Sainty's message of "Thu, 24 Oct 2013 11:36:31 +1300 (NZDT)") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:195113 Archived-At: "Phil Sainty" writes: > `vc-git-annotate-command' looks like this: > > (defun vc-git-annotate-command (file buf &optional rev) > (let ((name (file-relative-name file))) > (vc-git-command buf 'async nil "blame" "--date=iso" "-C" "-C" rev "--" > name))) > > By default, git blame produces short commit hashes. You need to pass > the -l argument to make it produce full hashes. > > This is a problem if the short hash is ambiguous, as none of the > vc-annotate commands for interacting with that commit work. > > Example errors for ambiguous commit hash 7b10edf8: (This bug report unfortunately got no response at the time.) The command in question now produces an 11-char short hash, which I think is pretty rarely ambiguous, in my experience, so I don't think there's anything more to fix here, and I'm closing this bug report. If there's still a problem here, please respond to the debbugs address and we'll reopen. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no